[GR-38002] Dispose the agent initialization binding on close.

PullRequest: graal/11524
oracle · Apr 8, 2022 · 5d35927 · 5d35927
2 parents ec27cac + 1c791c0
commit 5d35927
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...fle.tools.agentscript/src/com/oracle/truffle/tools/agentscript/impl/InsightPerSource.java b/...fle.tools.agentscript/src/com/oracle/truffle/tools/agentscript/impl/InsightPerSource.java
@@ -58,7 +58,7 @@ final class InsightPerSource implements ContextsListener, AutoCloseable, LoadSou
     private final Supplier<Source> src;
     private final AgentObject insight;
     private final IgnoreSources ignoredSources;
-    private EventBinding<?> agentBinding;
+    private volatile EventBinding<?> agentBinding;
     /* @GuardedBy("this") */
     private InsightInstrument.Key sourceBinding;
     /* @GuardedBy("this") */
@@ -160,6 +160,11 @@ public void close() {
             bindings = null;
         }
         onInit.dispose();
+        EventBinding<?> agentInitBinding = agentBinding;
+        if (agentInitBinding != null) {
+            agentInitBinding.dispose();
+        }
+        agentBinding = null;
         instrument.closeKeys(keys);
     }
 
@@ -264,8 +269,11 @@ final class InitializeLater implements ExecutionEventListener {
 
         @Override
         public void onEnter(EventContext ctx, VirtualFrame frame) {
-            CompilerDirectives.transferToInterpreter();
-            agentBinding.dispose();
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            EventBinding<?> agentInitBinding = agentBinding;
+            if (agentInitBinding != null) {
+                agentInitBinding.dispose();
+            }
             initializeAgent(context);
         }