Merge pull request #20159 from r30shah/disableDMHPR

Disable use of method handle for core reflection in JDK21
eclipse-openj9 · Sep 18, 2024 · 17a3fe8 · 17a3fe8
2 parents 8393fab + 3fc532d
commit 17a3fe8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/jcl/src/java.base/share/classes/java/lang/System.java b/jcl/src/java.base/share/classes/java/lang/System.java
@@ -748,6 +748,10 @@ private static void ensureProperties(boolean isInitialization) {
 	initializedProperties.put("native.encoding", platformEncoding); //$NON-NLS-1$
 	/*[ENDIF] JAVA_SPEC_VERSION >= 17 */
 
+	/*[IF JAVA_SPEC_VERSION == 21]*/
+	initializedProperties.putIfAbsent("jdk.reflect.useDirectMethodHandle", "false");
+	/*[ENDIF] JAVA_SPEC_VERSION == 21 */
+
 	/*[IF (JAVA_SPEC_VERSION >= 21) & (PLATFORM-mz31 | PLATFORM-mz64)]*/
 	initializedProperties.put("com.ibm.autocvt", zOSAutoConvert); //$NON-NLS-1$
 	/*[ENDIF] (JAVA_SPEC_VERSION >= 21) & (PLATFORM-mz31 | PLATFORM-mz64) */

diff --git a/...nal/cmdline_options_testresources/src_90/com/ibm/j9/getcallerclass/ReflectionMHTests.java b/...nal/cmdline_options_testresources/src_90/com/ibm/j9/getcallerclass/ReflectionMHTests.java
@@ -62,7 +62,9 @@ public static boolean test_getCallerClass_Helper_Reflection_fromBootExtWithAnnot
 			cls = (Class<?>) method.invoke(null, new Object[0]);
 
 			boolean isClassNameExpected;
-			if (VersionCheck.major() >= 18) {
+			if ((VersionCheck.major() >= 18)
+					&& (Boolean.getBoolean("jdk.reflect.useDirectMethodHandle") || (VersionCheck.major() != 21))
+			) {
 				isClassNameExpected = isSecurityFrameOrInjectedInvoker(cls);
 			} else {
 				isClassNameExpected = (cls == ReflectionMHTests.class);