Merge upstream-jdk

doc/hotspot-unit-tests.html

@@ -245,7 +245,7 @@ <h3 id="error-messages">Error messages</h3>
 <p>All GoogleTest asserts print compared expressions and their values,
 so there is no need to have them in error messages. Asserts print only
 compared values, they do not print any of interim variables, e.g.
-<code>ASSERT_TRUE((val1 == val2 &amp;&amp; isFail(foo(8)) || i == 18)</code>
+<code>ASSERT_TRUE((val1 == val2 &amp;&amp; isFail(foo(8))) || i == 18)</code>
 prints only one value. If you use some complex predicates, please
 consider <code>EXPECT_PRED*</code> or <code>EXPECT_FORMAT_PRED</code>
 assertions family, they check that a predicate returns true/success and

doc/hotspot-unit-tests.md

@@ -172,7 +172,7 @@ Provide informative, but not too verbose error messages.
 All GoogleTest asserts print compared expressions and their values, so
 there is no need to have them in error messages. Asserts print only
 compared values, they do not print any of interim variables, e.g.
-`ASSERT_TRUE((val1 == val2 && isFail(foo(8)) || i == 18)` prints only
+`ASSERT_TRUE((val1 == val2 && isFail(foo(8))) || i == 18)` prints only
 one value. If you use some complex predicates, please consider
 `EXPECT_PRED*` or `EXPECT_FORMAT_PRED` assertions family, they check that
 a predicate returns true/success and print out all parameters values.

src/hotspot/share/jfr/metadata/metadata.xml

@@ -46,10 +46,10 @@
        $ jfr print dump.jfr
 
        Programmatic access:
-       try (var rf = new RecordingFile(Path.of("dump.jfr)) {
+       try (var rf = new RecordingFile(Path.of("dump.jfr"))) {
            while (rf.hasMoreEvents()) {
                RecordedEvent e = rf.readEvent();
-               System.out.println(e.getName() + " " + e.getDuration()));
+               System.out.println(e.getName() + " " + e.getDuration());
            }
        };
   !-->

src/hotspot/share/prims/jvmti.xml

@@ -1218,7 +1218,7 @@ jvmtiEnv *jvmti;
                             <li><i>Timed wait?</i>
                               <ul>
                                 <li>Indefinite (<datalink
-                                    id="JVMTI_THREAD_STATE_WAITING_INDEFINITELY"><code>JVMTI_THREAD_STATE_WAITING_INDEFINITELY</code></datalink></li>
+                                    id="JVMTI_THREAD_STATE_WAITING_INDEFINITELY"><code>JVMTI_THREAD_STATE_WAITING_INDEFINITELY</code></datalink>)</li>
                                 <li>Timed (<datalink
                                     id="JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT"><code>JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT</code></datalink>)</li>
                               </ul>

src/java.base/share/man/java.md

@@ -1311,7 +1311,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
 `-XX:+PreserveFramePointer`
 :   Selects between using the RBP register as a general purpose register
     (`-XX:-PreserveFramePointer`) and using the RBP register to hold the frame
-    pointer of the currently executing method (`-XX:+PreserveFramePointer` . If
+    pointer of the currently executing method (`-XX:+PreserveFramePointer`). If
     the frame pointer is available, then external profiling tools (for example,
     Linux perf) can construct more accurate stack traces.
 

src/java.base/share/man/keytool.md

@@ -662,7 +662,7 @@ perform.
 
     -   {`-noprompt`}: Do not prompt
 
-    -   {`-addprovider` *name* \[`-providerarg` *arg*\]: Add security provider
+    -   {`-addprovider` *name* \[`-providerarg` *arg*\]}: Add security provider
         by name (such as SunPKCS11) with an optional configure argument.
 
     -   {`-providerclass` *class* \[`-providerarg` *arg*\]}: Add security
@@ -1617,7 +1617,7 @@ name information, the keystore password, and the private key password.
 The rest of the examples assume that you responded to the prompts with values
 equal to those specified in the first `-genkeypair` command. For example, a
 distinguished name of
-`cn=`*myname*`, ou=`*mygroup*`, o=`*mycompany*`, c=`*mycountry*).
+`cn=`*myname*`, ou=`*mygroup*`, o=`*mycompany*`, c=`*mycountry*.
 
 ## Requesting a Signed Certificate from a CA
 
@@ -1914,7 +1914,7 @@ Keystore implementation
     The `keytool` command works on any file-based keystore implementation. It
     treats the keystore location that is passed to it at the command line as a
     file name and converts it to a `FileInputStream`, from which it loads the
-    keystore information.)The `jarsigner` commands can read a keystore from any
+    keystore information. The `jarsigner` commands can read a keystore from any
     location that can be specified with a URL.
 
     For `keytool` and `jarsigner`, you can specify a keystore type at the

src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,9 @@
 package javax.swing.plaf.synth;
 
 import sun.swing.DefaultLookup;
+
 import javax.swing.JComponent;
+import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 
 /**
@@ -35,6 +37,12 @@
  */
 class SynthDefaultLookup extends DefaultLookup {
     public Object getDefault(JComponent c, ComponentUI ui, String key) {
+        if (ui instanceof SynthOptionPaneUI) {
+            Object value = super.getDefault(c, ui, key);
+            if (value != null) {
+                return value;
+            }
+        }
         if (!(ui instanceof SynthUI)) {
             Object value = super.getDefault(c, ui, key);
             return value;

src/jdk.compiler/share/man/javac.md

@@ -1667,7 +1667,7 @@ internal and subject to change at any time.
     public static int m() {
       try {
          throw new NullPointerException();
-      }  catch (NullPointerException(); {
+      }  catch (NullPointerException e) {
          System.err.println("Caught NullPointerException.");
          return 1;
        } finally {

test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorReinterpret.java

@@ -39,6 +39,7 @@
  * @modules jdk.incubator.vector
  * @modules java.base/jdk.internal.misc
  * @summary Test that vector reinterpret intrinsics work as intended.
+ * @requires os.arch != "riscv64" | vm.cpu.features ~= ".*rvv.*"
  * @library /test/lib /
  * @run main compiler.vectorapi.reshape.TestVectorReinterpret
  */

test/hotspot/jtreg/compiler/vectorization/TestVectorizationNegativeScale.java

@@ -25,7 +25,7 @@
  * @test
  * @bug 8332827
  * @summary [REDO] C2: crash in compiled code because of dependency on removed range check CastIIs
- *
+ * @requires os.arch != "riscv64" | vm.cpu.features ~= ".*rvv.*"
  * @library /test/lib /
  * @run driver TestVectorizationNegativeScale
  *

test/jdk/javax/swing/JOptionPane/bug4174551.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4174551
+ * @bug 4174551 8346260
  * @summary JOptionPane should allow custom buttons
  * @library /java/awt/regtesthelpers
  * @build PassFailJFrame