[GR-52599] Remove HostVM.installInThread.

PullRequest: graal/17219

Author: cstancu

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/HostVM.java

@@ -82,6 +82,10 @@ protected HostVM(OptionValues options, ClassLoader classLoader) {
         this.classReachabilityListeners = new ArrayList<>();
     }
 
+    public ClassLoader getClassLoader() {
+        return classLoader;
+    }
+
     public OptionValues options() {
         return options;
     }
@@ -246,17 +250,9 @@ public boolean platformSupported(AnnotatedElement element) {
         return true;
     }
 
-    public void installInThread(@SuppressWarnings("unused") Object vmConfig) {
-        Thread.currentThread().setContextClassLoader(classLoader);
-    }
-
     public void clearInThread() {
     }
 
-    public Object getConfiguration() {
-        return null;
-    }
-
     public abstract Comparator<? super ResolvedJavaType> getTypeComparator();
 
     /*

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java

@@ -65,7 +65,6 @@ private enum State {
     private final DebugContext debug;
     private final BigBang bb;
     private Timing timing;
-    private Object vmConfig;
 
     public interface Timing {
         long getPrintIntervalNanos();
@@ -97,7 +96,6 @@ public void init(Timing newTiming) {
         postedOperations.reset();
         completedOperations.reset();
         postedBeforeStart = Collections.synchronizedList(new ArrayList<>());
-        vmConfig = bb.getHostVM().getConfiguration();
     }
 
     /**
@@ -156,7 +154,6 @@ private void executeService(DebugContextRunnable command) {
 
     @SuppressWarnings("try")
     private void executeCommand(DebugContextRunnable command) {
-        bb.getHostVM().installInThread(vmConfig);
         long startTime = 0L;
         if (timing != null) {
             startTime = System.nanoTime();

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

@@ -72,7 +72,7 @@ public static final class HostedManagement {
          */
         private static HostedManagement singletonDuringImageBuild;
 
-        public static HostedManagement getAndAssertExists() {
+        private static HostedManagement getAndAssertExists() {
             HostedManagement result = get();
             assert result != null;
             return result;

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

@@ -276,17 +276,6 @@ public boolean isRelocatedPointer(JavaConstant constant) {
         return constant instanceof RelocatableConstant;
     }
 
-    @Override
-    public void installInThread(Object vmConfig) {
-        super.installInThread(vmConfig);
-        assert vmConfig == ImageSingletonsSupportImpl.HostedManagement.get();
-    }
-
-    @Override
-    public Object getConfiguration() {
-        return ImageSingletonsSupportImpl.HostedManagement.getAndAssertExists();
-    }
-
     @Override
     public void registerType(AnalysisType analysisType) {
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java

@@ -222,7 +222,7 @@ public boolean isDecorator() {
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode patternNode) {
                     String pattern = asConstantObject(b, String.class, patternNode);
                     if (pattern != null) {
-                        b.add(ReachabilityRegistrationNode.create(() -> parsePatternAndRegister(pattern), reason));
+                        b.add(ReachabilityRegistrationNode.create(() -> parsePatternAndRegister(loader, pattern), reason));
                         return true;
                     }
                     return false;
@@ -297,7 +297,7 @@ private static boolean isLimitPattern(String pattern) {
      * serialization/deserialization.</li>
      * </ul>
      */
-    private static void parsePatternAndRegister(String pattern) {
+    private static void parsePatternAndRegister(ImageClassLoader loader, String pattern) {
         String[] patterns = pattern.split(";");
         for (String p : patterns) {
             int nameLen = p.length();
@@ -324,12 +324,9 @@ private static void parsePatternAndRegister(String pattern) {
                     final String className = p.substring(poffset, nameLen - 1);
                     if (!negate) {
                         if (className.endsWith(LambdaUtils.SERIALIZATION_TEST_LAMBDA_CLASS_SUBSTRING)) {
-                            try {
-                                String lambdaHolderName = LambdaUtils.capturingClass(className);
-                                RuntimeSerialization.registerLambdaCapturingClass(Class.forName(lambdaHolderName, false, Thread.currentThread().getContextClassLoader()));
-                            } catch (ClassNotFoundException e) {
-                                // no class, no registration
-                            }
+                            String lambdaHolderName = LambdaUtils.capturingClass(className);
+                            // If the class cannot be loaded, there will be no registration
+                            loader.findClass(lambdaHolderName).ifPresent(RuntimeSerialization::registerLambdaCapturingClass);
                         }
                     }
                 }
@@ -340,15 +337,12 @@ private static void parsePatternAndRegister(String pattern) {
                 }
                 // Pattern is a class name
                 if (!negate) {
-                    try {
-                        /* Support arrays of non-primitive types */
-                        if (name.startsWith("[") && name.contains("[L") && !name.endsWith(";")) {
-                            name += ";";
-                        }
-                        RuntimeSerialization.register(Class.forName(name, false, Thread.currentThread().getContextClassLoader()));
-                    } catch (ClassNotFoundException e) {
-                        // no class, no registration
+                    /* Support arrays of non-primitive types */
+                    if (name.startsWith("[") && name.contains("[L") && !name.endsWith(";")) {
+                        name += ";";
                     }
+                    // If the class cannot be loaded, there will be no registration
+                    loader.findClass(name).ifPresent(RuntimeSerialization::register);
                 }
             }
         }