[GR-48726] Support HotSpotGraalVMEventListener being created before HotSpotGraalRuntime.

PullRequest: graal/15615

Author: dougxc

compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTest.java

@@ -44,6 +44,7 @@
 import org.graalvm.compiler.hotspot.CommunityCompilerConfigurationFactory;
 import org.graalvm.compiler.hotspot.CompilerConfigurationFactory;
 import org.graalvm.compiler.hotspot.EconomyCompilerConfigurationFactory;
+import org.graalvm.compiler.hotspot.HotSpotGraalVMEventListener;
 import org.graalvm.compiler.nodes.Cancellable;
 import org.graalvm.compiler.options.OptionDescriptor;
 import org.graalvm.compiler.options.OptionDescriptors;
@@ -259,7 +260,7 @@ private boolean isGraalClassAllowed(Class<?> cls) {
             return true;
         }
 
-        if (JVMCIServiceLocator.class.isAssignableFrom(cls) || cls == hotSpotGraalJVMCIServiceLocatorShared) {
+        if (JVMCIServiceLocator.class.isAssignableFrom(cls) || cls == hotSpotGraalJVMCIServiceLocatorShared || HotSpotGraalVMEventListener.class.isAssignableFrom(cls)) {
             return true;
         }
 

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java

@@ -48,18 +48,29 @@ <T> T getProvider(Class<T> service, HotSpotGraalJVMCIServiceLocator locator) {
                 if (graalRuntime != null) {
                     return service.cast(new HotSpotGraalVMEventListener(graalRuntime));
                 }
+                // Need to hold onto the listener to connect it with a Graal runtime
+                // once we have one. This supports a JVMCI runtime that eagerly
+                // creates its VM event listeners (JDK-8315566).
+                if (vmEventListener == null) {
+                    vmEventListener = new HotSpotGraalVMEventListener(null);
+                }
+                return service.cast(vmEventListener);
             }
             return null;
         }
 
         @NativeImageReinitialize private HotSpotGraalRuntime graalRuntime;
+        @NativeImageReinitialize private HotSpotGraalVMEventListener vmEventListener;
 
         /**
          * Notifies this object of the compiler created via {@link HotSpotGraalJVMCIServiceLocator}.
          */
         void onCompilerCreation(HotSpotGraalCompiler compiler) {
             assert this.graalRuntime == null : "only expect a single JVMCICompiler to be created";
             this.graalRuntime = (HotSpotGraalRuntime) compiler.getGraalRuntime();
+            if (this.vmEventListener != null) {
+                this.vmEventListener.setRuntime(graalRuntime);
+            }
         }
     }
 

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalVMEventListener.java

@@ -39,20 +39,27 @@
 
 public class HotSpotGraalVMEventListener implements HotSpotVMEventListener {
 
-    private final HotSpotGraalRuntime runtime;
+    private HotSpotGraalRuntime runtime;
     private List<HotSpotCodeCacheListener> listeners;
 
     HotSpotGraalVMEventListener(HotSpotGraalRuntime runtime) {
-        this.runtime = runtime;
+        setRuntime(runtime);
         listeners = new ArrayList<>();
         for (HotSpotCodeCacheListener listener : GraalServices.load(HotSpotCodeCacheListener.class)) {
             listeners.add(listener);
         }
     }
 
+    void setRuntime(HotSpotGraalRuntime runtime) {
+        assert this.runtime == null || this.runtime == runtime;
+        this.runtime = runtime;
+    }
+
     @Override
     public void notifyShutdown() {
-        runtime.shutdown();
+        if (runtime != null) {
+            runtime.shutdown();
+        }
     }
 
     @Override