Merge master jdk-23+29 into openj9-staging

Conflicts:
	.gitignore
	closed/custom/modules/jdk.jcmd/Java.gmk
	closed/make/modules/openj9.dtfj/Java.gmk
	closed/src/java.base/share/classes/sun/security/provider/NativeMD5.java
	closed/src/java.base/share/classes/sun/security/provider/NativeSHA.java
	make/autoconf/flags-cflags.m4
	make/autoconf/flags-ldflags.m4
	make/autoconf/jdk-options.m4
	make/autoconf/jvm-features.m4
	make/autoconf/toolchain.m4
	make/common/native/Link.gmk
	make/common/native/Paths.gmk
	make/conf/version-numbers.conf
	make/modules/java.base/Lib.gmk
	make/modules/java.base/lib/CoreLibraries.gmk
	make/modules/java.desktop/lib/ClientLibraries.gmk
	make/modules/jdk.jcmd/Java.gmk
	make/test/JtregNativeJdk.gmk
	src/java.base/aix/classes/jdk/internal/loader/ClassLoaderHelper.java
	src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
	src/java.base/share/classes/java/lang/String.java
	src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
	src/java.base/share/classes/jdk/internal/access/JavaxSecurityAccess.java
	src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java
	src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialModBinP.java
	src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java
	src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
	src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
	src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
	src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
	src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
	src/jdk.jfr/share/classes/jdk/jfr/internal/HiddenWait.java
	src/jdk.jfr/share/classes/jdk/jfr/internal/Level.java
	src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIInstrumentationMethod.java
	src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIInstrumentationTarget.java
	src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JITypeMapping.java
	src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GroupCallback.java
	test/hotspot/jtreg/ProblemList.txt
	test/hotspot/jtreg/compiler/lib/ir_framework/Setup.java
	test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/WriterThread.java
	test/hotspot/jtreg/compiler/predicates/TestAssertionPredicateDoesntConstantFold.java
	test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp
	test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp
	test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp
	test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp
	test/jdk/ProblemList-FIPS140_3_OpenJcePlus.txt
	test/jdk/ProblemList.txt
	test/jdk/java/awt/InputMethods/SpanishDiacriticsTest/SpanishDiacriticsTest.java
	test/jdk/java/awt/print/PrinterJob/PageDialogCancelTest.java
	test/jdk/java/foreign/critical/TestCriticalUpcall.java
	test/jdk/java/foreign/nested/libNested.c
	test/jdk/java/foreign/shared.h
	test/jdk/java/io/IO/IO.java
	test/jdk/java/io/IO/input.exp
	test/jdk/java/io/IO/output.exp
	test/jdk/java/lang/String/CompactString/MaxSizeUTF16String.java
	test/jdk/java/lang/Thread/virtual/stress/Skynet.java
	test/jdk/javax/management/monitor/ThreadPoolAccTest.java
	test/jdk/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java
	test/jdk/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java
	test/jdk/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java
	test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java
	test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java
	test/jdk/javax/management/security/AuthorizationTest.java
	test/jdk/javax/print/CustomMediaSizeNameOOMETest.java
	test/jdk/jdk/jfr/api/consumer/filestream/TestOrdered.java
	test/jdk/jdk/jfr/api/consumer/recordingstream/TestStop.java
	test/jdk/jni/nullCaller/CallHelper.hpp
	test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
	test/jdk/security/infra/javax/net/ssl/HttpsURLConnectionTest.java
	test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java
	test/micro/org/openjdk/bench/vm/compiler/CMove.java

Signed-off-by: Jason Feng <fengj@ca.ibm.com>

doc/building.html

@@ -68,7 +68,8 @@ <h1 class="title">Building the JDK</h1>
 <li><a href="#apple-xcode" id="toc-apple-xcode">Apple Xcode</a></li>
 <li><a href="#microsoft-visual-studio"
 id="toc-microsoft-visual-studio">Microsoft Visual Studio</a></li>
-<li><a href="#ibm-xl-cc" id="toc-ibm-xl-cc">IBM XL C/C++</a></li>
+<li><a href="#ibm-open-xl-cc" id="toc-ibm-open-xl-cc">IBM Open XL
+C/C++</a></li>
 </ul></li>
 <li><a href="#boot-jdk-requirements" id="toc-boot-jdk-requirements">Boot
 JDK Requirements</a>
@@ -673,11 +674,10 @@ <h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
 version number accordingly. If you have not installed the
 <code>BuildTools</code>, but e.g. <code>Professional</code>, adjust the
 product ID accordingly.</p>
-<h3 id="ibm-xl-cc">IBM XL C/C++</h3>
-<p>Please consult the AIX section of the <a
-href="https://wiki.openjdk.org/display/Build/Supported+Build+Platforms">Supported
-Build Platforms</a> OpenJDK Build Wiki page for details about which
-versions of XLC are supported.</p>
+<h3 id="ibm-open-xl-cc">IBM Open XL C/C++</h3>
+<p>The minimum accepted version of Open XL is 17.1.1.4. This is in
+essence clang 15, and will be treated as such by the OpenJDK build
+system.</p>
 <h2 id="boot-jdk-requirements">Boot JDK Requirements</h2>
 <p>Paradoxically, building the JDK requires a pre-existing JDK. This is
 called the "boot JDK". The boot JDK does not, however, have to be a JDK

doc/building.md

@@ -487,11 +487,10 @@ that the " characters are essential)
 accordingly. If you have not installed the `BuildTools`, but e.g.
 `Professional`, adjust the product ID accordingly.
 
-### IBM XL C/C++
+### IBM Open XL C/C++
 
-Please consult the AIX section of the [Supported Build Platforms](
-https://wiki.openjdk.org/display/Build/Supported+Build+Platforms) OpenJDK Build
-Wiki page for details about which versions of XLC are supported.
+The minimum accepted version of Open XL is 17.1.1.4. This is in essence clang
+15, and will be treated as such by the OpenJDK build system.
 
 ## Boot JDK Requirements
 

make/Main.gmk

@@ -1260,7 +1260,7 @@ all-docs-bundles: docs-jdk-bundles docs-javase-bundles docs-reference-bundles
 # This target builds the test image
 test-image: prepare-test-image test-image-jdk-jtreg-native \
     test-image-demos-jdk test-image-libtest-jtreg-native \
-    test-image-lib-native
+    test-image-lib test-image-lib-native
 
 ifneq ($(JVM_TEST_IMAGE_TARGETS), )
   # If JVM_TEST_IMAGE_TARGETS is externally defined, use it instead of the

make/autoconf/flags-cflags.m4

@@ -631,7 +631,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     LANGSTD_CXXFLAGS="-std:c++14"
   else
-    AC_MSG_ERROR([Don't know how to enable C++14 for this toolchain])
+    AC_MSG_ERROR([Cannot enable C++14 for this toolchain])
   fi
   TOOLCHAIN_CFLAGS_JDK_CXXONLY="$TOOLCHAIN_CFLAGS_JDK_CXXONLY $LANGSTD_CXXFLAGS"
   TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM $LANGSTD_CXXFLAGS"

make/autoconf/flags-ldflags.m4

@@ -27,7 +27,7 @@
 #
 
 # ===========================================================================
-# (c) Copyright IBM Corp. 2019, 2019 All Rights Reserved
+# (c) Copyright IBM Corp. 2019, 2024 All Rights Reserved
 # ===========================================================================
 
 AC_DEFUN([FLAGS_SETUP_LDFLAGS],

make/hotspot/lib/CompileJvm.gmk

@@ -104,8 +104,6 @@ ifneq ($(DEBUG_LEVEL), release)
   DISABLED_WARNINGS_gcc += strict-overflow
 endif
 
-DISABLED_WARNINGS_xlc := tautological-compare shift-negative-value
-
 DISABLED_WARNINGS_microsoft := 4624 4244 4291 4146 4127 4722
 
 ################################################################################
@@ -205,7 +203,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
     DISABLED_WARNINGS_clang_aix_debug.cpp := format-nonliteral, \
     DISABLED_WARNINGS_clang_aix_jvm.cpp := format-nonliteral, \
     DISABLED_WARNINGS_clang_aix_osThread_aix.cpp := tautological-undefined-compare, \
-    DISABLED_WARNINGS_xlc := $(DISABLED_WARNINGS_xlc), \
     DISABLED_WARNINGS_microsoft := $(DISABLED_WARNINGS_microsoft), \
     ASFLAGS := $(JVM_ASFLAGS), \
     LD_SET_ORIGIN := false, \

make/jdk/src/classes/build/tools/intpoly/FieldGen.java

@@ -778,7 +778,7 @@ private String generate(FieldParams params) throws IOException {
         result.appendLine("}");
 
         result.appendLine("@Override");
-        result.appendLine("protected int mult(long[] a, long[] b, long[] r) {");
+        result.appendLine("protected void mult(long[] a, long[] b, long[] r) {");
         result.incrIndent();
         for (int i = 0; i < 2 * params.getNumLimbs() - 1; i++) {
             result.appendIndent();
@@ -804,9 +804,6 @@ private String generate(FieldParams params) throws IOException {
             }
         }
         result.append(");\n");
-        result.appendIndent();
-        result.append("return 0;");
-        result.appendLine();
         result.decrIndent();
         result.appendLine("}");
 
@@ -836,7 +833,7 @@ private String generate(FieldParams params) throws IOException {
         //      }
         //  }
         result.appendLine("@Override");
-        result.appendLine("protected int square(long[] a, long[] r) {");
+        result.appendLine("protected void square(long[] a, long[] r) {");
         result.incrIndent();
         for (int i = 0; i < 2 * params.getNumLimbs() - 1; i++) {
             result.appendIndent();
@@ -877,9 +874,6 @@ private String generate(FieldParams params) throws IOException {
             }
         }
         result.append(");\n");
-        result.appendIndent();
-        result.append("return 0;");
-        result.appendLine();
         result.decrIndent();
         result.appendLine("}");
 

src/java.base/share/classes/java/lang/foreign/Linker.java

@@ -222,7 +222,7 @@
  * <pre>
  * MemoryLayout.structLayout(
  *     ValueLayout.JAVA_INT.withName("x"),
- *     MemoryLayout.paddingLayout(32),
+ *     MemoryLayout.paddingLayout(4),
  *     ValueLayout.JAVA_LONG.withName("y")
  * );
  * </pre>

src/java.base/share/classes/java/lang/foreign/MemoryLayout.java

@@ -369,7 +369,7 @@
  * int size = ...
  * MemorySegment points = ...
  * for (int i = 0 ; i < size ; i++) {
- *     ... POINT_ARR_X.get(segment, 0L, (long)i) ...
+ *     ... POINT_ARR_X.get(points, 0L, (long)i) ...
  * }
  * }
  *