Remove obsolete ClassForNameSupport workaround for libgraal building

Author: olpaw

substratevm/mx.substratevm/mx_substratevm.py

@@ -1671,6 +1671,7 @@ def prevent_build_path_in_libgraal():
 ] if mx.is_interactive() else []) + svm_experimental_options([
     "-H:LibGraalClassLoader=jdk.graal.compiler.libgraal.loader.HostedLibGraalClassLoader",
     "-Dlibgraal.module.path=${.}/../../../graalvm/libgraal.jar",
+    '-H:+ClassForNameRespectsClassLoader',
     '-H:-UseServiceLoaderFeature',
     '-H:+AllowFoldMethods',
     '-Dtruffle.TruffleRuntime=',

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

@@ -96,12 +96,6 @@ public boolean getAsBoolean() {
         }
     }
 
-    private ClassLoader libGraalLoader;
-
-    public void setLibGraalLoader(ClassLoader libGraalLoader) {
-        this.libGraalLoader = libGraalLoader;
-    }
-
     @Platforms(Platform.HOSTED_ONLY.class)
     public static ClassForNameSupport currentLayer() {
         return LayeredImageSingletonSupport.singleton().lookup(ClassForNameSupport.class, false, true);
@@ -201,17 +195,6 @@ public void registerClass(ConfigurationCondition condition, Class<?> clazz, Clas
                 ConditionalRuntimeValue<Object> existingEntry = knownClasses.get(name);
                 Object currentValue = existingEntry == null ? null : existingEntry.getValueUnconditionally();
 
-                /* TODO: Remove workaround once GR-53985 is implemented */
-                if (currentValue instanceof Class<?> currentClazz && clazz.getClassLoader() != currentClazz.getClassLoader()) {
-                    /* Ensure runtime lookup of LibGraalClassLoader classes */
-                    if (isLibGraalClass(currentClazz)) {
-                        return;
-                    }
-                    if (isLibGraalClass(clazz)) {
-                        currentValue = null;
-                    }
-                }
-
                 if (currentValue == null || // never seen
                                 currentValue == NEGATIVE_QUERY ||
                                 currentValue == clazz) {
@@ -251,11 +234,6 @@ private void addKnownClass(String name, Consumer<EconomicMap<String, Conditional
         }
     }
 
-    @Platforms(HOSTED_ONLY.class)
-    private boolean isLibGraalClass(Class<?> clazz) {
-        return libGraalLoader != null && clazz.getClassLoader() == libGraalLoader;
-    }
-
     public static ConditionalRuntimeValue<Object> updateConditionalValue(ConditionalRuntimeValue<Object> existingConditionalValue, Object newValue,
                     ConfigurationCondition additionalCondition) {
         if (existingConditionalValue == null) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderFeature.java

@@ -27,18 +27,14 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
-import org.graalvm.nativeimage.libgraal.hosted.LibGraalLoader;
-
 import com.oracle.graal.pointsto.heap.ImageHeapConstant;
 import com.oracle.svm.core.BuildPhaseProvider;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.fieldvaluetransformer.FieldValueTransformerWithAvailability;
 import com.oracle.svm.core.fieldvaluetransformer.ObjectToConstantFieldValueTransformer;
-import com.oracle.svm.core.hub.ClassForNameSupport;
 import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.hosted.FeatureImpl.DuringSetupAccessImpl;
 import com.oracle.svm.hosted.imagelayer.CrossLayerConstantRegistry;
 import com.oracle.svm.hosted.jdk.HostedClassLoaderPackageManagement;
 import com.oracle.svm.util.ReflectionUtil;
@@ -123,11 +119,6 @@ public void duringSetup(DuringSetupAccess access) {
 
         var config = (FeatureImpl.DuringSetupAccessImpl) access;
         if (ImageLayerBuildingSupport.firstImageBuild()) {
-            LibGraalLoader libGraalLoader = ((DuringSetupAccessImpl) access).imageClassLoader.classLoaderSupport.getLibGraalLoader();
-            if (libGraalLoader != null) {
-                ClassLoader libGraalClassLoader = (ClassLoader) libGraalLoader;
-                ClassForNameSupport.currentLayer().setLibGraalLoader(libGraalClassLoader);
-            }
             access.registerObjectReplacer(this::runtimeClassLoaderObjectReplacer);
             if (ImageLayerBuildingSupport.buildingInitialLayer()) {
                 config.registerObjectReachableCallback(ClassLoader.class, (a1, classLoader, reason) -> {