svm: remove usages of the JDKLatest predicate

Author: zapster

substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/Target_jdk_internal_foreign_Utils_BaseAndScale.java

@@ -30,14 +30,13 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.config.ConfigurationValues;
-import com.oracle.svm.core.jdk.JDKLatest;
 import com.oracle.svm.core.util.VMError;
 
 import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import jdk.internal.foreign.Utils;
 import jdk.vm.ci.meta.JavaKind;
 
-@TargetClass(className = "jdk.internal.foreign.Utils", innerClass = "BaseAndScale", onlyWith = {ForeignAPIPredicates.Enabled.class, JDKLatest.class})
+@TargetClass(className = "jdk.internal.foreign.Utils", innerClass = "BaseAndScale", onlyWith = ForeignAPIPredicates.Enabled.class)
 final class Target_jdk_internal_foreign_Utils_BaseAndScale {
     @Alias //
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = BaseFieldRecomputer.class) //

substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/Target_jdk_internal_misc_ScopedMemoryAccess.java

@@ -28,8 +28,6 @@
 
 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.jdk.JDKLatest;
 import com.oracle.svm.core.util.BasedOnJDKFile;
 
 import jdk.internal.foreign.MemorySessionImpl;
@@ -68,12 +66,11 @@ static void registerNatives() {
      * As one might notice, what is not supported is not creating shared arenas, but closing them.
      */
     @Substitute
-    @TargetElement(onlyWith = JDKLatest.class)
     void closeScope0(MemorySessionImpl session, Target_jdk_internal_misc_ScopedMemoryAccess_ScopedAccessError error) {
         throw unsupportedFeature("GR-52276: Arena.ofShared not supported");
     }
 }
 
-@TargetClass(className = "jdk.internal.misc.ScopedMemoryAccess$ScopedAccessError", onlyWith = {JDKLatest.class, ForeignAPIPredicates.Enabled.class})
+@TargetClass(className = "jdk.internal.misc.ScopedMemoryAccess$ScopedAccessError", onlyWith = ForeignAPIPredicates.Enabled.class)
 final class Target_jdk_internal_misc_ScopedMemoryAccess_ScopedAccessError {
 }

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

@@ -29,8 +29,6 @@
 import com.oracle.svm.core.SubstrateUtil;
 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.jdk.JDKLatest;
 
 @TargetClass(PhantomReference.class)
 public final class Target_java_lang_ref_PhantomReference<T> {
@@ -40,7 +38,6 @@ boolean refersTo0(Object obj) {
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDKLatest.class)
     private void clear0() {
         ReferenceInternals.clear(SubstrateUtil.cast(this, PhantomReference.class));
     }

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

@@ -43,8 +43,6 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 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.jdk.JDKLatest;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
 
@@ -133,7 +131,6 @@ private void clear0() {
         ReferenceInternals.clear(SubstrateUtil.cast(this, Reference.class));
     }
 
-    @TargetElement(onlyWith = JDKLatest.class)
     @KeepOriginal
     native void clearImpl();
 

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

@@ -30,14 +30,11 @@
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
-import com.oracle.svm.core.annotate.TargetElement;
-import com.oracle.svm.core.jdk.JDKLatest;
 
 @TargetClass(ReferenceQueue.class)
 final class Target_java_lang_ref_ReferenceQueue<T> {
     // Checkstyle: stop
     @Alias //
-    @TargetElement(onlyWith = JDKLatest.class) //
     static Target_java_lang_ref_ReferenceQueue<Object> NULL_QUEUE;
     // CheckStyle: resume
 

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.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.TargetElement;
-import com.oracle.svm.core.jdk.JDKLatest;
 import com.oracle.svm.core.thread.VMThreads;
 import com.oracle.svm.util.ReflectionUtil;
 
@@ -78,14 +77,13 @@ final class Target_java_lang_ref_Cleaner_Cleanable {
 @TargetClass(className = "jdk.internal.ref.CleanerImpl")
 final class Target_jdk_internal_ref_CleanerImpl {
 
-    @TargetElement(onlyWith = JDKLatest.class)//
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "jdk.internal.ref.CleanerImpl$CleanableList")//
     Target_jdk_internal_ref_CleanerImpl_CleanableList activeList;
 
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "java.lang.ref.ReferenceQueue")//
     public ReferenceQueue<Object> queue;
 
-    @TargetElement(name = "run", onlyWith = JDKLatest.class)
+    @TargetElement(name = "run")
     @Substitute
     public void run() {
         Thread t = Thread.currentThread();
@@ -108,7 +106,7 @@ public void run() {
     }
 }
 
-@TargetClass(className = "jdk.internal.ref.PhantomCleanable", onlyWith = JDKLatest.class)
+@TargetClass(className = "jdk.internal.ref.PhantomCleanable")
 final class Target_jdk_internal_ref_PhantomCleanable {
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = GetCleanableListSingletonTransformer.class) //
     Target_jdk_internal_ref_CleanerImpl_CleanableList list;
@@ -122,7 +120,7 @@ final class Target_jdk_internal_ref_PhantomCleanable {
     /* final */ native void clean();
 }
 
-@TargetClass(className = "jdk.internal.ref.CleanerImpl$CleanableList", onlyWith = JDKLatest.class)
+@TargetClass(className = "jdk.internal.ref.CleanerImpl$CleanableList")
 final class Target_jdk_internal_ref_CleanerImpl_CleanableList {
 
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "jdk.internal.ref.CleanerImpl$CleanableList$Node") //
@@ -136,7 +134,7 @@ final class Target_jdk_internal_ref_CleanerImpl_CleanableList {
 
 }
 
-@TargetClass(className = "jdk.internal.ref.CleanerImpl$CleanableList$Node", onlyWith = JDKLatest.class)
+@TargetClass(className = "jdk.internal.ref.CleanerImpl$CleanableList$Node")
 final class Target_jdk_internal_ref_CleanerImpl_CleanableList_Node {
 }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java

@@ -102,7 +102,6 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 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.classinitialization.ClassInitializationInfo;
 import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
 import com.oracle.svm.core.config.ConfigurationValues;
@@ -114,7 +113,6 @@
 import com.oracle.svm.core.heap.UnknownPrimitiveField;
 import com.oracle.svm.core.imagelayer.DynamicImageLayerInfo;
 import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
-import com.oracle.svm.core.jdk.JDKLatest;
 import com.oracle.svm.core.jdk.ProtectionDomainSupport;
 import com.oracle.svm.core.jdk.Resources;
 import com.oracle.svm.core.meta.SharedType;
@@ -1647,7 +1645,6 @@ private static Class<?> forName(String name, boolean initialize, ClassLoader loa
     }
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDKLatest.class)
     public static native Class<?> forPrimitiveName(String primitiveName);
 
     @KeepOriginal
@@ -1705,11 +1702,9 @@ public String toString() {
     public native String toGenericString();
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDKLatest.class)
     private native void addSealingInfo(int modifiersParam, StringBuilder sb);
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDKLatest.class)
     private native boolean hasSealedAncestor(Class<?> clazz);
 
     @KeepOriginal
@@ -2054,7 +2049,6 @@ private Class<?>[] getPermittedSubclasses0() {
     private native GenericsFactory getFactory();
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDKLatest.class)
     native Method findMethod(boolean publicOnly, String nameParam, Class<?>... parameterTypes);
 
     @KeepOriginal
@@ -2064,7 +2058,6 @@ private Class<?>[] getPermittedSubclasses0() {
     private static native void addAll(Collection<Field> c, Field[] o);
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDKLatest.class)
     private native Target_java_lang_PublicMethods_MethodList getMethodsRecursive(String methodName, Class<?>[] parameterTypes, boolean includeStatic, boolean publicOnly);
 
     @KeepOriginal
@@ -2342,7 +2335,6 @@ public FieldAccessor newFieldAccessor(Field field0, boolean override) {
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDKLatest.class)
     private Constructor<?> generateConstructor(Class<?> cl, Constructor<?> constructorToCall) {
         SerializationRegistry serializationRegistry = ImageSingletons.lookup(SerializationRegistry.class);
         ConstructorAccessor acc = (ConstructorAccessor) serializationRegistry.getSerializationConstructorAccessor(cl, constructorToCall.getDeclaringClass());

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ForeignDisabledSubstitutions.java

@@ -37,7 +37,6 @@
 import com.oracle.svm.core.SubstrateOptions;
 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.option.SubstrateOptionsParser;
 import com.oracle.svm.core.util.VMError;
 
@@ -54,7 +53,6 @@ public boolean getAsBoolean() {
 final class Target_jdk_internal_foreign_MemorySessionImpl {
     @Substitute
     @SuppressWarnings("static-method")
-    @TargetElement(onlyWith = JDKLatest.class)
     Target_jdk_internal_foreign_ArenaImpl asArena() {
         throw ForeignDisabledSubstitutions.fail();
     }
@@ -64,7 +62,7 @@ Target_jdk_internal_foreign_ArenaImpl asArena() {
 final class Target_java_lang_foreign_Arena {
 }
 
-@TargetClass(className = "jdk.internal.foreign.ArenaImpl", onlyWith = {ForeignDisabled.class, JDKLatest.class})
+@TargetClass(className = "jdk.internal.foreign.ArenaImpl", onlyWith = {ForeignDisabled.class})
 final class Target_jdk_internal_foreign_ArenaImpl {
 }
 
@@ -122,7 +120,7 @@ final class Target_jdk_internal_foreign_FunctionDescriptorImpl {
 final class Target_java_lang_foreign_FunctionDescriptor {
 }
 
-@TargetClass(className = "jdk.internal.foreign.SegmentFactories", onlyWith = {ForeignDisabled.class, JDKLatest.class})
+@TargetClass(className = "jdk.internal.foreign.SegmentFactories", onlyWith = {ForeignDisabled.class})
 final class Target_jdk_internal_foreign_SegmentFactories {
     @Substitute
     @AlwaysInline("Make remaining code in callers unreachable.")
@@ -148,7 +146,7 @@ final class Target_jdk_internal_foreign_LayoutPath {
 final class Target_java_lang_foreign_MemoryLayout_PathElement {
 }
 
-@TargetClass(className = "jdk.internal.foreign.layout.AbstractLayout", onlyWith = {ForeignDisabled.class, JDKLatest.class})
+@TargetClass(className = "jdk.internal.foreign.layout.AbstractLayout", onlyWith = {ForeignDisabled.class})
 final class Target_jdk_internal_foreign_layout_AbstractLayout {
     @Substitute
     @AlwaysInline("Make remaining code in callers unreachable.")
@@ -158,7 +156,6 @@ VarHandle varHandle(Target_java_lang_foreign_MemoryLayout_PathElement... element
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDKLatest.class)
     @SuppressWarnings({"unused", "static-method"})
     VarHandle varHandleInternal(Target_java_lang_foreign_MemoryLayout_PathElement... elements) {
         throw ForeignDisabledSubstitutions.fail();

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java

@@ -215,7 +215,6 @@ final class Target_java_lang_StringUTF16 {
 final class Target_java_lang_Throwable {
 
     @Alias //
-    @TargetElement(onlyWith = JDKLatest.class) //
     @RecomputeFieldValue(kind = Kind.FromAlias, isFinal = true) //
     static boolean jfrTracing = false;
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java

@@ -46,7 +46,6 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 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.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.util.BasedOnJDKFile;
@@ -227,7 +226,6 @@ public static int getCommonPoolParallelism() {
     }
 
     @Alias //
-    @TargetElement(onlyWith = JDKLatest.class)
     public static native ForkJoinPool asyncCommonPool();
 }