Remove JDK8OrEarlier and JDK11OrLater predicates

Author: Christian Wimmer

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/SunMiscSubstitutions.java

@@ -42,10 +42,7 @@
 import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
-import com.oracle.svm.core.annotate.TargetElement;
 import com.oracle.svm.core.headers.LibC;
-import com.oracle.svm.core.jdk.JDK11OrLater;
-import com.oracle.svm.core.jdk.JDK8OrEarlier;
 import com.oracle.svm.core.jdk.RuntimeSupport;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.os.IsDefined;
@@ -72,14 +69,7 @@ public String apply(TargetClass annotation) {
 final class Target_jdk_internal_misc_Signal {
 
     @Substitute
-    @TargetElement(onlyWith = JDK8OrEarlier.class)
-    private static /* native */ int findSignal(String signalName) {
-        return Util_jdk_internal_misc_Signal.numberFromName(signalName);
-    }
-
-    @Substitute
-    @TargetElement(onlyWith = JDK11OrLater.class)
-    private static /* native */ int findSignal0(String signalName) {
+    private static int findSignal0(String signalName) {
         return Util_jdk_internal_misc_Signal.numberFromName(signalName);
     }
 
@@ -416,7 +406,7 @@ public void run() {
     }
 }
 
-@TargetClass(className = "jdk.internal.misc.VM", onlyWith = JDK11OrLater.class)
+@TargetClass(className = "jdk.internal.misc.VM")
 final class Target_jdk_internal_misc_VM {
 
     /* Implementation from src/hotspot/share/prims/jvm.cpp#L286 translated to Java. */

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

@@ -49,10 +49,8 @@
 import com.oracle.svm.core.annotate.TargetElement;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.annotate.UnknownClass;
-import com.oracle.svm.core.jdk.JDK11OrLater;
 import com.oracle.svm.core.jdk.JDK17OrLater;
 import com.oracle.svm.core.jdk.JDK17_0_2OrLater;
-import com.oracle.svm.core.jdk.JDK8OrEarlier;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
 
@@ -159,45 +157,17 @@ boolean refersTo0(Object obj) {
     @KeepOriginal
     native boolean isEnqueued();
 
-    @Substitute
-    @TargetElement(onlyWith = JDK8OrEarlier.class)
-    @SuppressWarnings("unused")
-    static boolean tryHandlePending(boolean waitForNotify) {
-        /*
-         * This method in JDK 8 was replaced by waitForReferenceProcessing in JDK 11. On JDK 8, it
-         * helped with reference handling by handling a single reference (if one is available). The
-         * only caller (apart from the reference handling thread itself) in the JDK is
-         * `Bits.reserveMemory`, which passes `false` as the parameter `waitForNotify`. So our
-         * substitution, which always waits, is a considerable change in semantics. However, since
-         * `Bits.reserveMemory` did not change much between JDK 8 and JDK 11, this is OK.
-         */
-        try {
-            return ReferenceInternals.waitForReferenceProcessing();
-        } catch (InterruptedException ex) {
-            Thread.currentThread().interrupt();
-            /*
-             * The caller might loop until "there is no more progress", i.e., until this method
-             * returns false. So returning true could lead to an infinite loop in the caller that is
-             * not interruptible.
-             */
-            return false;
-        }
-    }
-
     /** May be used by {@code JavaLangRefAccess} via {@code SharedSecrets}. */
     @Substitute
-    @TargetElement(onlyWith = JDK11OrLater.class)
     static boolean waitForReferenceProcessing() throws InterruptedException {
         return ReferenceInternals.waitForReferenceProcessing();
     }
 
     @Override
     @KeepOriginal //
-    @TargetElement(onlyWith = JDK11OrLater.class) //
     protected native Object clone() throws CloneNotSupportedException;
 
     @Substitute //
-    @TargetElement(onlyWith = JDK11OrLater.class) //
     @SuppressWarnings("unused")
     static void reachabilityFence(Object ref) {
         GraalDirectives.blackhole(ref);

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

@@ -36,7 +36,6 @@
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.TargetElement;
 import com.oracle.svm.core.jdk.JDK11OrEarlier;
-import com.oracle.svm.core.jdk.JDK11OrLater;
 
 @Platforms(Platform.HOSTED_ONLY.class)
 class Package_jdk_internal_ref implements Function<TargetClass, String> {
@@ -74,25 +73,25 @@ public final class Target_jdk_internal_ref_Cleaner {
  * handling is the same as on JDK 8.
  * </ul>
  */
-@TargetClass(className = "jdk.internal.ref.CleanerFactory", onlyWith = JDK11OrLater.class)
+@TargetClass(className = "jdk.internal.ref.CleanerFactory")
 final class Target_jdk_internal_ref_CleanerFactory {
     @Alias
     public static native Target_java_lang_ref_Cleaner cleaner();
 }
 
-@TargetClass(className = "java.lang.ref.Cleaner", onlyWith = JDK11OrLater.class)
+@TargetClass(className = "java.lang.ref.Cleaner")
 final class Target_java_lang_ref_Cleaner {
     @Alias//
     public Target_jdk_internal_ref_CleanerImpl impl;
 }
 
-@TargetClass(className = "java.lang.ref.Cleaner$Cleanable", onlyWith = JDK11OrLater.class)
+@TargetClass(className = "java.lang.ref.Cleaner$Cleanable")
 final class Target_java_lang_ref_Cleaner_Cleanable {
     @Alias
     native void clean();
 }
 
-@TargetClass(className = "jdk.internal.ref.CleanerImpl", onlyWith = JDK11OrLater.class)
+@TargetClass(className = "jdk.internal.ref.CleanerImpl")
 final class Target_jdk_internal_ref_CleanerImpl {
 
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "jdk.internal.ref.CleanerImpl$PhantomCleanableRef")//
@@ -110,16 +109,16 @@ final class Target_jdk_internal_ref_CleanerImpl {
     public ReferenceQueue<Object> queue;
 }
 
-@TargetClass(className = "jdk.internal.ref.PhantomCleanable", onlyWith = JDK11OrLater.class)
+@TargetClass(className = "jdk.internal.ref.PhantomCleanable")
 final class Target_jdk_internal_ref_PhantomCleanable {
 }
 
 // Removed by JDK-8251861
-@TargetClass(className = "jdk.internal.ref.WeakCleanable", onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class})
+@TargetClass(className = "jdk.internal.ref.WeakCleanable", onlyWith = JDK11OrEarlier.class)
 final class Target_jdk_internal_ref_WeakCleanable {
 }
 
 // Removed by JDK-8251861
-@TargetClass(className = "jdk.internal.ref.SoftCleanable", onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class})
+@TargetClass(className = "jdk.internal.ref.SoftCleanable", onlyWith = JDK11OrEarlier.class)
 final class Target_jdk_internal_ref_SoftCleanable {
 }