svm: fix JDK 21 after "JDK-8343704: Bad GC parallelism with processing Cleaner queues"

zapster · zapster · commit 09cdf6fbd230 · 2024-12-09T14:54:01.000+01:00
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_jdk_internal_ref_Cleaner.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_jdk_internal_ref_Cleaner.java
@@ -27,6 +27,7 @@
 import java.lang.ref.Cleaner;
 import java.lang.ref.ReferenceQueue;
 
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
 
 import com.oracle.svm.core.NeverInline;
@@ -200,7 +201,7 @@ public Object transform(Object receiver, Object originalValue) {
 }
 
 final class Target_jdk_internal_ref_CleanerImpl_CleanableList_Singleton {
-    static final Object list = ReflectionUtil.newInstance(ReflectionUtil.lookupClass("jdk.internal.ref.CleanerImpl$CleanableList"));
+    static final Object list = JavaVersionUtil.JAVA_SPEC > 21 ? ReflectionUtil.newInstance(ReflectionUtil.lookupClass("jdk.internal.ref.CleanerImpl$CleanableList")) : null;
 }
 
 final class GetCleanableListSingletonTransformer implements FieldValueTransformer {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`import java.lang.ref.Cleaner;`
`28`	`28`	`import java.lang.ref.ReferenceQueue;`
`29`	`29`
	`30`	`+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;`
`30`	`31`	`import org.graalvm.nativeimage.hosted.FieldValueTransformer;`
`31`	`32`
`32`	`33`	`import com.oracle.svm.core.NeverInline;`
`@@ -200,7 +201,7 @@ public Object transform(Object receiver, Object originalValue) {`
`200`	`201`	`}`
`201`	`202`
`202`	`203`	`final class Target_jdk_internal_ref_CleanerImpl_CleanableList_Singleton {`
`203`		`- static final Object list = ReflectionUtil.newInstance(ReflectionUtil.lookupClass("jdk.internal.ref.CleanerImpl$CleanableList"));`
	`204`	`+ static final Object list = JavaVersionUtil.JAVA_SPEC > 21 ? ReflectionUtil.newInstance(ReflectionUtil.lookupClass("jdk.internal.ref.CleanerImpl$CleanableList")) : null;`
`204`	`205`	`}`
`205`	`206`
`206`	`207`	`final class GetCleanableListSingletonTransformer implements FieldValueTransformer {`