Ensure handles are created in the global context.

Author: pecimuth

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replaycomp/CompilationProxies.java

@@ -73,4 +73,11 @@ public interface CompilationProxies {
      * @return a debug closeable object representing the debug context
      */
     DebugCloseable withDebugContext(DebugContext debugContext);
+
+    /**
+     * Enters the context of a method compilation.
+     *
+     * @return a scope for the context
+     */
+    DebugCloseable enterCompilationContext();
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replaycomp/RecordingCompilationProxies.java

@@ -139,11 +139,7 @@ public List<OperationRecorder.RecordedOperation> collectOperationsForSerializati
         return recorder.getCurrentRecordedOperations();
     }
 
-    /**
-     * Enters the context of a method compilation for the current compilation thread.
-     *
-     * @return a scope for the context
-     */
+    @Override
     public DebugCloseable enterCompilationContext() {
         return recorder.enterCompilationContext();
     }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replaycomp/ReplayCompilationProxies.java

@@ -41,6 +41,8 @@
 import jdk.graal.compiler.debug.GlobalMetrics;
 import jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.hotspot.CompilationContext;
+import jdk.graal.compiler.hotspot.HotSpotGraalServices;
 import jdk.graal.compiler.hotspot.Platform;
 import jdk.graal.compiler.hotspot.replaycomp.proxy.CompilationProxy;
 import jdk.graal.compiler.hotspot.replaycomp.proxy.CompilationProxyBase;
@@ -222,6 +224,17 @@ public DebugCloseable withDebugContext(DebugContext debugContext) {
         };
     }
 
+    @Override
+    public DebugCloseable enterCompilationContext() {
+        // The handles created during replay are cached across compilations.
+        CompilationContext context = HotSpotGraalServices.enterGlobalCompilationContext();
+        if (context == null) {
+            return DebugCloseable.VOID_CLOSEABLE;
+        } else {
+            return context::close;
+        }
+    }
+
     /**
      * Loads the recorded operations from a collection.
      *

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replaycomp/ReplayCompilationSupport.java

@@ -263,18 +263,16 @@ public DebugCloseable withDebugContext(DebugContext debug) {
      * @return a debug closeable that should be closed after the compilation
      */
     public DebugCloseable enterCompilationContext(HotSpotCompilationRequest originalRequest, OptionValues initialOptions) {
-        if (proxies instanceof RecordingCompilationProxies recordingCompilationProxies) {
-            DebugCloseable context = recordingCompilationProxies.enterCompilationContext();
-            return () -> {
-                try {
+        DebugCloseable context = proxies.enterCompilationContext();
+        return () -> {
+            try {
+                if (proxies instanceof RecordingCompilationProxies) {
                     serializeRecordedCompilation(originalRequest, initialOptions);
-                } finally {
-                    context.close();
                 }
-            };
-        } else {
-            return DebugCloseable.VOID_CLOSEABLE;
-        }
+            } finally {
+                context.close();
+            }
+        };
     }
 
     private void serializeRecordedCompilation(HotSpotCompilationRequest originalRequest, OptionValues initialOptions) {