Remove @TargetClass annotation element only ever used for GuestGraal POC

Author: olpaw

sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/TargetClass.java

@@ -47,7 +47,6 @@
 import java.util.function.BooleanSupplier;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -141,21 +140,6 @@
      */
     String[] innerClass() default {};
 
-    /**
-     * Specifies a custom classloader that will be used to look up the substitutee class name.
-     *
-     * @since 24.2
-     */
-    Class<? extends Supplier<ClassLoader>> classLoader() default NoClassLoaderProvider.class;
-
-    /**
-     * Marker value for {@link #classLoader} that no custom classloader should be used.
-     *
-     * @since 24.2
-     */
-    interface NoClassLoaderProvider extends Supplier<ClassLoader> {
-    }
-
     /**
      * Substitute only if all provided predicates are true (default: unconditional substitution that
      * is always included).

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotationSubstitutionProcessor.java

@@ -46,7 +46,6 @@
 import java.util.function.BooleanSupplier;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
 
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageSingletons;
@@ -1107,20 +1106,18 @@ Class<?> findTargetClass(Class<?> annotatedBaseClass, TargetClass target) {
 
     protected Class<?> findTargetClass(Class<?> annotatedBaseClass, TargetClass target, boolean checkOnlyWith) {
         return findTargetClass(TargetClass.class, TargetClass.NoClassNameProvider.class,
-                        annotatedBaseClass, target, target.value(), target.className(), target.classNameProvider(), target.innerClass(), target.classLoader(),
+                        annotatedBaseClass, target, target.value(), target.className(), target.classNameProvider(), target.innerClass(),
                         checkOnlyWith ? target.onlyWith() : null);
     }
 
     protected <T> Class<?> findTargetClass(Class<T> targetClass, Class<?> noClassNameProviderClass,
                     Class<?> annotatedBaseClass, T target, Class<?> value, String targetClassName, Class<? extends Function<T, String>> classNameProvider, String[] innerClasses,
-                    Class<? extends Supplier<ClassLoader>> classloaderSupplier, Class<?>[] onlyWith) {
+                    Class<?>[] onlyWith) {
         Class<?> holder;
         String className;
-        ClassLoader suppliedLoader = null;
         if (value != targetClass) {
             guarantee(targetClassName.isEmpty(), "Both class and class name specified for substitution");
             guarantee(classNameProvider == noClassNameProviderClass, "Both class and classNameProvider specified for substitution");
-            guarantee(classloaderSupplier == TargetClass.NoClassLoaderProvider.class, "Annotation attribute 'classLoader' requires use of 'className' or 'classNameProvider'");
 
             holder = value;
             className = holder.getName();
@@ -1136,13 +1133,6 @@ protected <T> Class<?> findTargetClass(Class<T> targetClass, Class<?> noClassNam
                 guarantee(!targetClassName.isEmpty(), "Neither class, className, nor classNameProvider specified for substitution");
                 className = targetClassName;
             }
-            if (classloaderSupplier != TargetClass.NoClassLoaderProvider.class) {
-                try {
-                    suppliedLoader = ReflectionUtil.newInstance(classloaderSupplier).get();
-                } catch (ReflectionUtilError ex) {
-                    throw UserError.abort(ex.getCause(), "Cannot instantiate classloaderSupplier: %s. The class must have a parameterless constructor.", classloaderSupplier.getTypeName());
-                }
-            }
         }
         if (onlyWith != null) {
             for (Class<?> onlyWithClass : onlyWith) {
@@ -1172,7 +1162,7 @@ protected <T> Class<?> findTargetClass(Class<T> targetClass, Class<?> noClassNam
         }
 
         if (holder == null) {
-            var substitutionsClassLoaders = suppliedLoader != null ? List.of(suppliedLoader) : imageClassLoader.classLoaderSupport.getClassLoaders();
+            var substitutionsClassLoaders = imageClassLoader.classLoaderSupport.getClassLoaders();
             for (ClassLoader substitutionsClassLoader : substitutionsClassLoaders) {
                 try {
                     holder = Class.forName(className, false, substitutionsClassLoader);