Track frame reference root node instead of call node

msimacek · msimacek · commit b05594206f39 · 2025-06-30T09:15:21.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java
@@ -1209,7 +1209,7 @@ public static IndirectCallData lookupIndirectCallData(Node node) {
 
     public static IndirectCallData createIndirectCallData(Node node) {
         CompilerAsserts.neverPartOfCompilation();
-        return get(node).indirectCallDataMap.computeIfAbsent(node, n -> new IndirectCallData(node));
+        return get(node).indirectCallDataMap.computeIfAbsent(node, n -> new IndirectCallData());
     }
 
     public Source getOrCreateSource(Function<Object, Source> rootNodeFunction, Object key) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -2514,12 +2514,12 @@ class InitializeBuildClass {
                     // will use the explicitly given object as it is
                 }
             }
-            Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+            Object savedState = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);
             InitializeBuildClass init;
             try {
                 init = new InitializeBuildClass(ctx);
             } finally {
-                IndirectCallContext.exit(frame, indirectCallData, savedState);
+                IndirectCallContext.exit(frame, inliningTarget, indirectCallData, savedState);
             }
 
             Object ns;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/OperatorModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/OperatorModuleBuiltins.java
@@ -159,7 +159,7 @@ static boolean compare(VirtualFrame frame, Object left, Object right,
                 if (!bufferAcquireLib.hasBuffer(left) || !bufferAcquireLib.hasBuffer(right)) {
                     throw raiseNode.raise(inliningTarget, TypeError, ErrorMessages.UNSUPPORTED_OPERAND_TYPES_OR_COMBINATION_OF_TYPES, left, right);
                 }
-                Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+                Object savedState = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);
                 Object leftBuffer = bufferAcquireLib.acquireReadonly(left);
                 try {
                     Object rightBuffer = bufferAcquireLib.acquireReadonly(right);
@@ -170,7 +170,7 @@ static boolean compare(VirtualFrame frame, Object left, Object right,
                     }
                 } finally {
                     bufferLib.release(leftBuffer);
-                    IndirectCallContext.exit(frame, indirectCallData, savedState);
+                    IndirectCallContext.exit(frame, inliningTarget, indirectCallData, savedState);
                 }
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/StructureBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/StructureBuiltins.java
@@ -191,11 +191,11 @@ static int _init_pos_args(VirtualFrame frame, Node inliningTarget, Object self,
                                     indirectCallData, setAttr, getItemNode, toString, getItem, pyTypeStgDictNode, getBaseClassNode, equalNode,
                                     raiseNode, recursionLimit - 1);
                 } else {
-                    Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+                    Object savedState = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);
                     try {
                         index = _init_pos_args_boundary(self, base, args, kwds, index, indirectCallData, setAttr, getItemNode);
                     } finally {
-                        IndirectCallContext.exit(frame, indirectCallData, savedState);
+                        IndirectCallContext.exit(frame, inliningTarget, indirectCallData, savedState);
                     }
                 }
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/buffer/PythonBufferAccessLibrary.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/buffer/PythonBufferAccessLibrary.java
@@ -117,11 +117,11 @@ public void release(@SuppressWarnings("unused") Object receiver) {
      * multiple times on the same buffer.
      */
     public final void release(Object receiver, VirtualFrame frame, IndirectCallData indirectCallData) {
-        Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+        Object savedState = IndirectCallContext.enter(frame, this, indirectCallData);
         try {
             release(receiver);
         } finally {
-            IndirectCallContext.exit(frame, indirectCallData, savedState);
+            IndirectCallContext.exit(frame, this, indirectCallData, savedState);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/buffer/PythonBufferAcquireLibrary.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/buffer/PythonBufferAcquireLibrary.java
@@ -115,11 +115,11 @@ public final Object acquireReadonly(Object receiver) {
      * node which is an ancestor of the library.
      */
     public final Object acquireReadonly(Object receiver, VirtualFrame frame, IndirectCallData indirectCallData) {
-        Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+        Object savedState = IndirectCallContext.enter(frame, this, indirectCallData);
         try {
             return acquire(receiver, BufferFlags.PyBUF_SIMPLE);
         } finally {
-            IndirectCallContext.exit(frame, indirectCallData, savedState);
+            IndirectCallContext.exit(frame, this, indirectCallData, savedState);
         }
     }
 
@@ -165,11 +165,11 @@ public final Object acquireWritable(Object receiver) {
      * node which is an ancestor of the library.
      */
     public final Object acquireWritable(Object receiver, VirtualFrame frame, IndirectCallData indirectCallData) {
-        Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+        Object savedState = IndirectCallContext.enter(frame, this, indirectCallData);
         try {
             return acquire(receiver, BufferFlags.PyBUF_WRITABLE);
         } finally {
-            IndirectCallContext.exit(frame, indirectCallData, savedState);
+            IndirectCallContext.exit(frame, this, indirectCallData, savedState);
         }
     }
 
@@ -198,13 +198,13 @@ public final Object acquireWritable(Object receiver, VirtualFrame frame, PythonC
      * acquisition produced.
      */
     public final Object acquireWritableWithTypeError(Object receiver, String callerName, VirtualFrame frame, IndirectCallData indirectCallData) {
-        Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+        Object savedState = IndirectCallContext.enter(frame, this, indirectCallData);
         try {
             return acquireWritable(receiver);
         } catch (PException e) {
             throw PRaiseNode.raiseStatic(this, TypeError, ErrorMessages.S_BRACKETS_ARG_MUST_BE_READ_WRITE_BYTES_LIKE_NOT_P, callerName, receiver);
         } finally {
-            IndirectCallContext.exit(frame, indirectCallData, savedState);
+            IndirectCallContext.exit(frame, this, indirectCallData, savedState);
         }
     }
 
@@ -234,11 +234,11 @@ public Object acquire(Object receiver, int flags) {
      * library.
      */
     public final Object acquire(Object receiver, int flags, VirtualFrame frame, IndirectCallData indirectCallData) {
-        Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+        Object savedState = IndirectCallContext.enter(frame, this, indirectCallData);
         try {
             return acquire(receiver, flags);
         } finally {
-            IndirectCallContext.exit(frame, indirectCallData, savedState);
+            IndirectCallContext.exit(frame, this, indirectCallData, savedState);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesCommonBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesCommonBuiltins.java
@@ -363,12 +363,12 @@ static Object mod(VirtualFrame frame, Object self, Object right,
                 byte[] bytes = bufferLib.getInternalOrCopiedByteArray(buffer);
                 int bytesLen = bufferLib.getBufferLength(buffer);
                 BytesFormatProcessor formatter = new BytesFormatProcessor(PythonContext.get(inliningTarget), getTupleItemNode, bytes, bytesLen, inliningTarget);
-                Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+                Object savedState = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);
                 try {
                     byte[] data = formatter.format(right);
                     return create.execute(inliningTarget, self, data);
                 } finally {
-                    IndirectCallContext.exit(frame, indirectCallData, savedState);
+                    IndirectCallContext.exit(frame, inliningTarget, indirectCallData, savedState);
                 }
             } finally {
                 bufferLib.release(buffer, frame, indirectCallData);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/PFrame.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/PFrame.java
@@ -60,6 +60,7 @@
 import com.oracle.truffle.api.bytecode.BytecodeNode;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
 
 public final class PFrame extends PythonBuiltinObject {
     private static final int UNINITIALIZED_LINE = -2;
@@ -121,13 +122,12 @@ public void setJumpDestLine(int jumpDestLine) {
     // TODO: frames: this is a large object, think about how to make this
     // smaller
     public static final class Reference {
-        public static final Reference EMPTY = new Reference(null);
+        public static final Reference EMPTY = new Reference(null, null);
 
         // The Python-level frame
         private PFrame pyFrame = null;
 
-        // The location of the last call
-        private Node callNode = null;
+        private final RootNode rootNode;
 
         // A flag whether this frame is escaped. A Truffle frame is escaped if the corresponding
         // PFrame may be used without having the Truffle frame on the stack. This flag is also set
@@ -136,10 +136,15 @@ public static final class Reference {
 
         private final Reference callerInfo;
 
-        public Reference(Reference callerInfo) {
+        public Reference(RootNode rootNode, Reference callerInfo) {
+            this.rootNode = rootNode;
             this.callerInfo = callerInfo;
         }
 
+        public RootNode getRootNode() {
+            return rootNode;
+        }
+
         public void setBackref(PFrame.Reference backref) {
             assert pyFrame != null : "setBackref should only be called when the PFrame escaped";
             pyFrame.setBackref(backref);
@@ -162,14 +167,6 @@ public void setPyFrame(PFrame escapedFrame) {
             this.pyFrame = escapedFrame;
         }
 
-        public Node getCallNode() {
-            return callNode;
-        }
-
-        public void setCallNode(Node callNode) {
-            this.callNode = callNode;
-        }
-
         public Reference getCallerInfo() {
             return callerInfo;
         }
@@ -188,10 +185,10 @@ public PFrame(PythonLanguage lang, @SuppressWarnings("unused") Object threadStat
         Object[] frameArgs = PArguments.create();
         PArguments.setGlobals(frameArgs, globals);
         PArguments.setSpecialArgument(frameArgs, localsDict);
-        Reference curFrameInfo = new Reference(null);
+        this.location = GetCodeRootNode.executeUncached(code);
+        Reference curFrameInfo = new Reference(location != null ? location.getRootNode() : null, null);
         this.virtualFrameInfo = curFrameInfo;
         curFrameInfo.setPyFrame(this);
-        this.location = GetCodeRootNode.executeUncached(code);
         this.line = this.location == null ? code.getFirstLineNo() : UNINITIALIZED_LINE;
         this.arguments = frameArgs;
         this.locals = null;
@@ -291,8 +288,8 @@ public RootCallTarget getTarget() {
         if (callTarget == null) {
             if (location != null) {
                 callTarget = PythonUtils.getOrCreateCallTarget(location.getRootNode());
-            } else if (getRef() != null && getRef().getCallNode() != null) {
-                callTarget = PythonUtils.getOrCreateCallTarget(getRef().getCallNode().getRootNode());
+            } else if (getRef() != null && getRef().getRootNode() != null) {
+                callTarget = PythonUtils.getOrCreateCallTarget(getRef().getRootNode());
             }
         }
         return callTarget;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/MemoryViewNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/MemoryViewNodes.java
@@ -628,11 +628,11 @@ public static void executeUncached(BufferLifecycleManager buffer) {
         }
 
         public final void execute(VirtualFrame frame, Node inliningTarget, IndirectCallData indirectCallData, BufferLifecycleManager buffer) {
-            Object state = IndirectCallContext.enter(frame, indirectCallData);
+            Object state = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);
             try {
                 execute(inliningTarget, buffer);
             } finally {
-                IndirectCallContext.exit(frame, indirectCallData, state);
+                IndirectCallContext.exit(frame, inliningTarget, indirectCallData, state);
             }
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java
@@ -905,11 +905,11 @@ static Object dir(VirtualFrame frame, Object obj,
             }
             Object klass = lookupAttrNode.execute(frame, inliningTarget, obj, T___CLASS__);
             if (klass != PNone.NO_VALUE) {
-                Object state = IndirectCallContext.enter(frame, indirectCallData);
+                Object state = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);
                 try {
                     com.oracle.graal.python.builtins.objects.type.TypeBuiltins.DirNode.dir(names, klass);
                 } finally {
-                    IndirectCallContext.exit(frame, indirectCallData, state);
+                    IndirectCallContext.exit(frame, inliningTarget, indirectCallData, state);
                 }
             }
             return constructListNode.execute(frame, names);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java
@@ -1210,11 +1210,11 @@ static PList dir(VirtualFrame frame, Object klass,
                         @Cached ConstructListNode constructListNode,
                         @Cached("createFor(this)") IndirectCallData indirectCallData) {
             PSet names = PFactory.createSet(PythonLanguage.get(inliningTarget));
-            Object state = IndirectCallContext.enter(frame, indirectCallData);
+            Object state = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);
             try {
                 dir(names, klass);
             } finally {
-                IndirectCallContext.exit(frame, indirectCallData, state);
+                IndirectCallContext.exit(frame, inliningTarget, indirectCallData, state);
             }
             return constructListNode.execute(frame, names);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectHashNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectHashNode.java
@@ -199,12 +199,12 @@ private static TpSlots handleNoHash(VirtualFrame frame, Node inliningTarget, Obj
              */
             long flags = readTypeObjectFieldNode.readFromObj(nativeKlass, CFields.PyTypeObject__tp_flags);
             if (typeIsNotReadyProfile.profile(inliningTarget, (flags & TypeFlags.READY) == 0)) {
-                Object savedState = IndirectCallContext.enter(frame, indirectCallData);
+                Object savedState = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);
                 try {
                     slots = callTypeReady(inliningTarget, object, nativeKlass);
                     initialized = true;
                 } finally {
-                    IndirectCallContext.exit(frame, indirectCallData, savedState);
+                    IndirectCallContext.exit(frame, inliningTarget, indirectCallData, savedState);
                 }
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java
@@ -1057,7 +1057,7 @@ public void createGeneratorFrame(Object[] arguments) {
         Object[] generatorFrameArguments = PArguments.create();
         MaterializedFrame generatorFrame = Truffle.getRuntime().createMaterializedFrame(generatorFrameArguments, getFrameDescriptor());
         PArguments.setGeneratorFrame(arguments, generatorFrame);
-        PArguments.setCurrentFrameInfo(generatorFrameArguments, new PFrame.Reference(null));
+        PArguments.setCurrentFrameInfo(generatorFrameArguments, new PFrame.Reference(getRootNode(), null));
         // The invoking node will set these two to the correct value only when the callee requests
         // it, otherwise they stay at the initial value, which we must set to null here
         PArguments.setException(arguments, null);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.java
@@ -91,9 +91,8 @@ public final PFrame execute(boolean markAsEscaped, Frame frameToMaterialize) {
 
     public final PFrame execute(boolean markAsEscaped, boolean forceSync, Frame frameToMaterialize) {
         PFrame.Reference info = PArguments.getCurrentFrameInfo(frameToMaterialize);
-        assert info != null && info.getCallNode() != null : "cannot materialize a frame without location information";
-        Node callNode = info.getCallNode();
-        return execute(callNode, markAsEscaped, forceSync, frameToMaterialize);
+        Node rootNode = info.getRootNode();
+        return execute(rootNode, markAsEscaped, forceSync, frameToMaterialize);
     }
 
     public final PFrame execute(Frame frame, boolean markAsEscaped) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadCallerFrameNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadCallerFrameNode.java
@@ -155,7 +155,7 @@ public PFrame executeWith(PFrame.Reference startFrameInfo, FrameInstance.FrameAc
                         return ensureMaterializeNode().execute(false, true, callerFrame);
                     }
                     return null;
-                } else if (!selector.skip(callerInfo)) {
+                } else if (!selector.skip(callerInfo.getRootNode())) {
                     i++;
                 }
                 curFrameInfo = callerInfo;
@@ -180,7 +180,7 @@ private PFrame.Reference walkLevels(PFrame.Reference startFrameInfo, FrameInstan
                     return PArguments.getCurrentFrameInfo(callerFrame);
                 }
                 return PFrame.Reference.EMPTY;
-            } else if (!selector.skip(callerInfo)) {
+            } else if (!selector.skip(callerInfo.getRootNode())) {
                 i++;
             }
             currentFrame = callerInfo;
@@ -323,19 +323,6 @@ public Frame visitFrame(FrameInstance frameInstance) {
                             if (i == level || startFrame == null) {
                                 Frame frame = getFrame(frameInstance, frameAccess);
                                 assert PArguments.isPythonFrame(frame);
-                                PFrame.Reference info = PArguments.getCurrentFrameInfo(frame);
-                                // avoid overriding the location if we don't know it
-                                if (callNode != null) {
-                                    info.setCallNode(callNode);
-                                } else {
-                                    // In some special cases we call without a Truffle call node; in
-                                    // this case, we use the root node as location (e.g. see
-                                    // AsyncHandler.processAsyncActions).
-                                    info.setCallNode(pRootNode);
-                                }
-                                // We may never return a frame without location because then we
-                                // cannot materialize it.
-                                assert info.getCallNode() != null : "tried to read frame without location (root: " + pRootNode + ")";
                                 outputFrame[0] = frame;
                                 needsCallerFrame = false;
                             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/ExecutionContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/ExecutionContext.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/IndirectCallData.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/IndirectCallData.java

Original file line number	Diff line number	Diff line change
`@@ -1209,7 +1209,7 @@ public static IndirectCallData lookupIndirectCallData(Node node) {`
`1209`	`1209`
`1210`	`1210`	`public static IndirectCallData createIndirectCallData(Node node) {`
`1211`	`1211`	`CompilerAsserts.neverPartOfCompilation();`
`1212`		`- return get(node).indirectCallDataMap.computeIfAbsent(node, n -> new IndirectCallData(node));`
	`1212`	`+ return get(node).indirectCallDataMap.computeIfAbsent(node, n -> new IndirectCallData());`
`1213`	`1213`	`}`
`1214`	`1214`
`1215`	`1215`	`public Source getOrCreateSource(Function<Object, Source> rootNodeFunction, Object key) {`
Original file line number	Diff line number	Diff line change
`@@ -2514,12 +2514,12 @@ class InitializeBuildClass {`
`2514`	`2514`	`// will use the explicitly given object as it is`
`2515`	`2515`	`}`
`2516`	`2516`	`}`
`2517`		`- Object savedState = IndirectCallContext.enter(frame, indirectCallData);`
	`2517`	`+ Object savedState = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);`
`2518`	`2518`	`InitializeBuildClass init;`
`2519`	`2519`	`try {`
`2520`	`2520`	`init = new InitializeBuildClass(ctx);`
`2521`	`2521`	`} finally {`
`2522`		`- IndirectCallContext.exit(frame, indirectCallData, savedState);`
	`2522`	`+ IndirectCallContext.exit(frame, inliningTarget, indirectCallData, savedState);`
`2523`	`2523`	`}`
`2524`	`2524`
`2525`	`2525`	`Object ns;`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ static boolean compare(VirtualFrame frame, Object left, Object right,`
`159`	`159`	`if (!bufferAcquireLib.hasBuffer(left) \|\| !bufferAcquireLib.hasBuffer(right)) {`
`160`	`160`	`throw raiseNode.raise(inliningTarget, TypeError, ErrorMessages.UNSUPPORTED_OPERAND_TYPES_OR_COMBINATION_OF_TYPES, left, right);`
`161`	`161`	`}`
`162`		`- Object savedState = IndirectCallContext.enter(frame, indirectCallData);`
	`162`	`+ Object savedState = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);`
`163`	`163`	`Object leftBuffer = bufferAcquireLib.acquireReadonly(left);`
`164`	`164`	`try {`
`165`	`165`	`Object rightBuffer = bufferAcquireLib.acquireReadonly(right);`
`@@ -170,7 +170,7 @@ static boolean compare(VirtualFrame frame, Object left, Object right,`
`170`	`170`	`}`
`171`	`171`	`} finally {`
`172`	`172`	`bufferLib.release(leftBuffer);`
`173`		`- IndirectCallContext.exit(frame, indirectCallData, savedState);`
	`173`	`+ IndirectCallContext.exit(frame, inliningTarget, indirectCallData, savedState);`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,11 +191,11 @@ static int _init_pos_args(VirtualFrame frame, Node inliningTarget, Object self,`
`191`	`191`	`indirectCallData, setAttr, getItemNode, toString, getItem, pyTypeStgDictNode, getBaseClassNode, equalNode,`
`192`	`192`	`raiseNode, recursionLimit - 1);`
`193`	`193`	`} else {`
`194`		`- Object savedState = IndirectCallContext.enter(frame, indirectCallData);`
	`194`	`+ Object savedState = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);`
`195`	`195`	`try {`
`196`	`196`	`index = _init_pos_args_boundary(self, base, args, kwds, index, indirectCallData, setAttr, getItemNode);`
`197`	`197`	`} finally {`
`198`		`- IndirectCallContext.exit(frame, indirectCallData, savedState);`
	`198`	`+ IndirectCallContext.exit(frame, inliningTarget, indirectCallData, savedState);`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,11 @@ public void release(@SuppressWarnings("unused") Object receiver) {`
`117`	`117`	`* multiple times on the same buffer.`
`118`	`118`	`*/`
`119`	`119`	`public final void release(Object receiver, VirtualFrame frame, IndirectCallData indirectCallData) {`
`120`		`- Object savedState = IndirectCallContext.enter(frame, indirectCallData);`
	`120`	`+ Object savedState = IndirectCallContext.enter(frame, this, indirectCallData);`
`121`	`121`	`try {`
`122`	`122`	`release(receiver);`
`123`	`123`	`} finally {`
`124`		`- IndirectCallContext.exit(frame, indirectCallData, savedState);`
	`124`	`+ IndirectCallContext.exit(frame, this, indirectCallData, savedState);`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -628,11 +628,11 @@ public static void executeUncached(BufferLifecycleManager buffer) {`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`public final void execute(VirtualFrame frame, Node inliningTarget, IndirectCallData indirectCallData, BufferLifecycleManager buffer) {`
`631`		`- Object state = IndirectCallContext.enter(frame, indirectCallData);`
	`631`	`+ Object state = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);`
`632`	`632`	`try {`
`633`	`633`	`execute(inliningTarget, buffer);`
`634`	`634`	`} finally {`
`635`		`- IndirectCallContext.exit(frame, indirectCallData, state);`
	`635`	`+ IndirectCallContext.exit(frame, inliningTarget, indirectCallData, state);`
`636`	`636`	`}`
`637`	`637`	`}`
`638`	`638`
Original file line number	Diff line number	Diff line change
`@@ -905,11 +905,11 @@ static Object dir(VirtualFrame frame, Object obj,`
`905`	`905`	`}`
`906`	`906`	`Object klass = lookupAttrNode.execute(frame, inliningTarget, obj, T___CLASS__);`
`907`	`907`	`if (klass != PNone.NO_VALUE) {`
`908`		`- Object state = IndirectCallContext.enter(frame, indirectCallData);`
	`908`	`+ Object state = IndirectCallContext.enter(frame, inliningTarget, indirectCallData);`
`909`	`909`	`try {`
`910`	`910`	`com.oracle.graal.python.builtins.objects.type.TypeBuiltins.DirNode.dir(names, klass);`
`911`	`911`	`} finally {`
`912`		`- IndirectCallContext.exit(frame, indirectCallData, state);`
	`912`	`+ IndirectCallContext.exit(frame, inliningTarget, indirectCallData, state);`
`913`	`913`	`}`
`914`	`914`	`}`
`915`	`915`	`return constructListNode.execute(frame, names);`