Load resumption call target when materializing async/generator functi…

…on expressions.
oracle · May 9, 2023 · 41510ec · 41510ec
1 parent 65817f2
commit 41510ec
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 0 deletions.
diff --git a/.../com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/control/AsyncFunctionBodyNode.java b/.../com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/control/AsyncFunctionBodyNode.java
@@ -51,6 +51,7 @@
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.InstrumentableNode;
 import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.source.SourceSection;
@@ -284,4 +285,12 @@ protected JavaScriptNode copyUninitialized(Set<Class<? extends Tag>> materialize
                         resumptionRootNode);
     }
 
+    @Override
+    public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag>> materializedTags) {
+        if (!materializedTags.isEmpty()) {
+            // ensure resumption call target is visible to instrumentation.
+            resumptionRootNode.getCallTarget();
+        }
+        return this;
+    }
 }
diff --git a/...com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/control/AsyncGeneratorBodyNode.java b/...com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/control/AsyncGeneratorBodyNode.java
@@ -53,6 +53,7 @@
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.InstrumentableNode;
 import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -300,4 +301,13 @@ protected JavaScriptNode copyUninitialized(Set<Class<? extends Tag>> materialize
                         cloneUninitialized(writeAsyncContext, materializedTags),
                         resumptionRootNode);
     }
+
+    @Override
+    public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag>> materializedTags) {
+        if (!materializedTags.isEmpty()) {
+            // ensure resumption call target is visible to instrumentation.
+            resumptionRootNode.getCallTarget();
+        }
+        return this;
+    }
 }
diff --git a/.../src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/control/GeneratorBodyNode.java b/.../src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/control/GeneratorBodyNode.java
@@ -44,6 +44,7 @@
 import java.util.Set;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.InstrumentableNode;
 import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -217,4 +218,13 @@ private void generatorStart(VirtualFrame frame, JSDynamicObject generatorObject)
     protected JavaScriptNode copyUninitialized(Set<Class<? extends Tag>> materializedTags) {
         return new GeneratorBodyNode(context, generatorRootNode);
     }
+
+    @Override
+    public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag>> materializedTags) {
+        if (!materializedTags.isEmpty()) {
+            // ensure resumption call target is visible to instrumentation.
+            generatorRootNode.getCallTarget();
+        }
+        return this;
+    }
 }
diff --git a/...racle.truffle.js/src/com/oracle/truffle/js/nodes/control/TopLevelAwaitModuleBodyNode.java b/...racle.truffle.js/src/com/oracle/truffle/js/nodes/control/TopLevelAwaitModuleBodyNode.java
@@ -46,6 +46,7 @@
 import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.InstrumentableNode;
 import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.source.SourceSection;
@@ -199,4 +200,12 @@ protected JavaScriptNode copyUninitialized(Set<Class<? extends Tag>> materialize
                         resumptionRootNode);
     }
 
+    @Override
+    public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag>> materializedTags) {
+        if (!materializedTags.isEmpty()) {
+            // ensure resumption call target is visible to instrumentation.
+            resumptionRootNode.getCallTarget();
+        }
+        return this;
+    }
 }