JDK25 bring up

JasonFengJ9 · JasonFengJ9 · commit 62dddba442a4 · 2024-12-10T09:13:19.000-05:00
Removed usages of
sun.reflect.misc.ReflectUtil.needsPackageAccessCheck/checkProxyPackageAccess.

Signed-off-by: Jason Feng &lt;fengj@ca.ibm.com&gt;
diff --git a/jcl/jpp_configuration.xml b/jcl/jpp_configuration.xml
@@ -241,6 +241,34 @@
 		<parameter name="jxerules:outputdir" value="java/lang"/>
 	</configuration>
 
+	<configuration
+		  label="JAVA25"
+		  outputpath="JAVA25/src"
+		  dependencies="JAVA24"
+		  jdkcompliance="22">
+		<classpathentry kind="src" path="src/java.base/share/classes"/>
+		<classpathentry kind="src" path="src/java.management/share/classes"/>
+		<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
+		<classpathentry kind="src" path="src/jdk.jcmd/share/classes"/>
+		<classpathentry kind="src" path="src/jdk.management/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.criu/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.dataaccess/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.dtfj/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.dtfjview/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.gpu/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.sharedclasses/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.traceformat/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.zosconditionhandling/share/classes"/>
+		<classpathentry kind="lib" path="/binaries/common/ibm/ibmjzos.jar"/>
+		<classpathentry kind="lib" path="/binaries/vm/third/rt-compressed.sunJava24.jar"/>
+		<source path="src"/>
+		<parameter name="macro:define" value="JAVA_SPEC_VERSION=25"/>
+		<parameter name="msg:outputdir" value="java.base/share/classes/com/ibm/oti/util"/>
+		<parameter name="jxerules:outputdir" value="java/lang"/>
+	</configuration>
+
 	<configuration
 		  label="OPENJ9-RAWBUILD"
 		  outputpath="OPENJ9-RAWBUILD/src"
diff --git a/jcl/src/java.base/share/classes/java/lang/Class.java b/jcl/src/java.base/share/classes/java/lang/Class.java
@@ -5913,6 +5913,7 @@ public Class<?>[] getPermittedSubclasses()
 			getUnsafe().putObjectRelease(this, localPermittedSubclassesCacheOffset, localPermittedSubclasses);
 		}
 
+		/*[IF JAVA_SPEC_VERSION < 24]*/
 		@SuppressWarnings("removal")
 		SecurityManager sm = System.getSecurityManager();
 		if (null != sm) {
@@ -5931,6 +5932,7 @@ public Class<?>[] getPermittedSubclasses()
 				sm.checkPackageAccess(pkgName);
 			}
 		}
+		/*[ENDIF] JAVA_SPEC_VERSION < 24 */
 
 		return localPermittedSubclasses;
 	}
diff --git a/jcl/src/java.base/share/classes/java/lang/J9VMInternals.java b/jcl/src/java.base/share/classes/java/lang/J9VMInternals.java
@@ -387,6 +387,7 @@ private static void threadCleanup(Thread thread) {
 
 	/*[PR CVMC 124584] checkPackageAccess(), not defineClassImpl(), should use ProtectionDomain */
 	private static void checkPackageAccess(final Class clazz, ProtectionDomain pd) {
+		/*[IF JAVA_SPEC_VERSION < 24]*/
 		@SuppressWarnings("removal")
 		final SecurityManager sm = System.getSecurityManager();
 		if (sm != null) {
@@ -407,6 +408,7 @@ public Object run() {
 				}
 			}, new AccessControlContext(pdArray));
 		}
+		/*[ENDIF] JAVA_SPEC_VERSION < 24 */
 	}
 
 	/*[PR CMVC 104341] Exceptions in Object.finalize() not ignored */
diff --git a/test/TestConfig/resources/excludes/latest_exclude_25.txt b/test/TestConfig/resources/excludes/latest_exclude_25.txt
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright IBM Corp. and others 2023
+# Copyright IBM Corp. and others 2024
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License 2.0 which accompanies this
diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_25.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_25.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <!--
-Copyright IBM Corp. and others 2023
+Copyright IBM Corp. and others 2024
 
 This program and the accompanying materials are made available under
 the terms of the Eclipse Public License 2.0 which accompanies this

Original file line number	Diff line number	Diff line change
`@@ -5913,6 +5913,7 @@ public Class<?>[] getPermittedSubclasses()`
`5913`	`5913`	`getUnsafe().putObjectRelease(this, localPermittedSubclassesCacheOffset, localPermittedSubclasses);`
`5914`	`5914`	`}`
`5915`	`5915`
	`5916`	`+ /[IF JAVA_SPEC_VERSION < 24]/`
`5916`	`5917`	`@SuppressWarnings("removal")`
`5917`	`5918`	`SecurityManager sm = System.getSecurityManager();`
`5918`	`5919`	`if (null != sm) {`
`@@ -5931,6 +5932,7 @@ public Class<?>[] getPermittedSubclasses()`
`5931`	`5932`	`sm.checkPackageAccess(pkgName);`
`5932`	`5933`	`}`
`5933`	`5934`	`}`
	`5935`	`+ /[ENDIF] JAVA_SPEC_VERSION < 24 /`
`5934`	`5936`
`5935`	`5937`	`return localPermittedSubclasses;`
`5936`	`5938`	`}`
Original file line number	Diff line number	Diff line change
`@@ -387,6 +387,7 @@ private static void threadCleanup(Thread thread) {`
`387`	`387`
`388`	`388`	`/[PR CVMC 124584] checkPackageAccess(), not defineClassImpl(), should use ProtectionDomain /`
`389`	`389`	`private static void checkPackageAccess(final Class clazz, ProtectionDomain pd) {`
	`390`	`+ /[IF JAVA_SPEC_VERSION < 24]/`
`390`	`391`	`@SuppressWarnings("removal")`
`391`	`392`	`final SecurityManager sm = System.getSecurityManager();`
`392`	`393`	`if (sm != null) {`
`@@ -407,6 +408,7 @@ public Object run() {`
`407`	`408`	`}`
`408`	`409`	`}, new AccessControlContext(pdArray));`
`409`	`410`	`}`
	`411`	`+ /[ENDIF] JAVA_SPEC_VERSION < 24 /`
`410`	`412`	`}`
`411`	`413`
`412`	`414`	`/[PR CMVC 104341] Exceptions in Object.finalize() not ignored /`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`##############################################################################`
`2`		`-# Copyright IBM Corp. and others 2023`
	`2`	`+# Copyright IBM Corp. and others 2024`
`3`	`3`	`#`
`4`	`4`	`# This program and the accompanying materials are made available under`
`5`	`5`	`# the terms of the Eclipse Public License 2.0 which accompanies this`