[JDK-8355586] Adapt JDK-8354897: Support Soft/Weak Reference in AOT cache

PullRequest: graal/20661

Author: mur47x111

common.json

@@ -8,7 +8,7 @@
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+21-2454", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+21-2525", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceInternals.java

@@ -161,7 +161,7 @@ public static <T> void setNextDiscovered(Reference<T> instance, Reference<?> new
     }
 
     public static boolean hasQueue(Reference<?> instance) {
-        return cast(instance).queue != Target_java_lang_ref_ReferenceQueue.NULL;
+        return cast(instance).queue != Target_java_lang_ref_ReferenceQueue.NULL_QUEUE;
     }
 
     /*
@@ -229,7 +229,7 @@ public static void processPendingReferences() {
                 } else {
                     @SuppressWarnings("unchecked")
                     Target_java_lang_ref_ReferenceQueue<? super Object> queue = SubstrateUtil.cast(ref.queue, Target_java_lang_ref_ReferenceQueue.class);
-                    if (queue != Target_java_lang_ref_ReferenceQueue.NULL) {
+                    if (queue != Target_java_lang_ref_ReferenceQueue.NULL_QUEUE) {
                         // Enqueues, avoiding the potentially overridden Reference.enqueue().
                         queue.enqueue(ref);
                     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java

@@ -119,7 +119,7 @@ public final class Target_java_lang_ref_Reference<T> {
     @Uninterruptible(reason = "The initialization of the fields must be atomic with respect to collection.")
     Target_java_lang_ref_Reference(T referent, Target_java_lang_ref_ReferenceQueue<? super T> queue) {
         this.referent = referent;
-        this.queue = (queue == null) ? Target_java_lang_ref_ReferenceQueue.NULL : queue;
+        this.queue = (queue == null) ? Target_java_lang_ref_ReferenceQueue.NULL_QUEUE : queue;
     }
 
     @KeepOriginal

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_ReferenceQueue.java

@@ -33,7 +33,7 @@
 
 @TargetClass(ReferenceQueue.class)
 final class Target_java_lang_ref_ReferenceQueue<T> {
-    @Alias static Target_java_lang_ref_ReferenceQueue<Object> NULL;
+    @Alias static Target_java_lang_ref_ReferenceQueue<Object> NULL_QUEUE;
 
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) //
     volatile Reference<? extends T> head;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/methodhandles/Target_java_lang_invoke_MethodTypeForm.java

@@ -33,7 +33,6 @@
 import com.oracle.svm.core.annotate.TargetElement;
 import com.oracle.svm.core.fieldvaluetransformer.NewEmptyArrayFieldValueTransformer;
 import com.oracle.svm.core.invoke.Target_java_lang_invoke_MemberName;
-import com.oracle.svm.core.jdk.JDK21OrEarlier;
 import com.oracle.svm.core.jdk.JDKLatest;
 
 @TargetClass(className = "java.lang.invoke.MethodTypeForm")
@@ -45,20 +44,11 @@ final class Target_java_lang_invoke_MethodTypeForm {
      * writing.
      */
     @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NewEmptyArrayFieldValueTransformer.class, isFinal = true) //
-    @TargetElement(onlyWith = JDKLatest.class) //
-    private Object[] methodHandles;
+    private SoftReference<?>[] methodHandles;
     @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NewEmptyArrayFieldValueTransformer.class, isFinal = true) //
-    @TargetElement(onlyWith = JDKLatest.class) //
-    private Object[] lambdaForms;
+    private SoftReference<?>[] lambdaForms;
 
     @Alias @RecomputeFieldValue(kind = Kind.Reset) //
     @TargetElement(onlyWith = JDKLatest.class) //
     private SoftReference<Target_java_lang_invoke_MemberName> interpretEntry;
-
-    @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NewEmptyArrayFieldValueTransformer.class, isFinal = true) //
-    @TargetElement(name = "methodHandles", onlyWith = JDK21OrEarlier.class) //
-    private SoftReference<?>[] methodHandlesJDK21;
-    @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NewEmptyArrayFieldValueTransformer.class, isFinal = true) //
-    @TargetElement(name = "lambdaForms", onlyWith = JDK21OrEarlier.class) //
-    private SoftReference<?>[] lambdaFormsJDK21;
 }