Skip to content

Commit 90c726c

Browse files
committed
Fix: requested caller frame using wrong start frame info.
1 parent 432a3b7 commit 90c726c

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@
185185
import com.oracle.truffle.api.dsl.TypeSystemReference;
186186
import com.oracle.truffle.api.frame.Frame;
187187
import com.oracle.truffle.api.frame.FrameDescriptor;
188-
import com.oracle.truffle.api.frame.FrameInstance;
189188
import com.oracle.truffle.api.frame.FrameSlot;
190189
import com.oracle.truffle.api.frame.VirtualFrame;
191190
import com.oracle.truffle.api.nodes.ExplodeLoop;
@@ -677,7 +676,7 @@ Object execInheritGlobalsInheritLocals(VirtualFrame frame, Object source, @Suppr
677676
@Cached ReadCallerFrameNode readCallerFrameNode,
678677
@Cached ReadLocalsNode getLocalsNode) {
679678
PCode code = createAndCheckCode(frame, source);
680-
PFrame callerFrame = readCallerFrameNode.executeWith(frame, PArguments.getCurrentFrameInfo(frame), 0);
679+
PFrame callerFrame = readCallerFrameNode.executeWith(frame, 0);
681680
Object[] args = PArguments.create();
682681
inheritGlobals(callerFrame, args);
683682
inheritLocals(frame, callerFrame, args, getLocalsNode);
@@ -707,7 +706,7 @@ Object execCustomGlobalsGlobalLocals(VirtualFrame frame, Object source, PDict gl
707706
Object execInheritGlobalsCustomLocals(VirtualFrame frame, Object source, @SuppressWarnings("unused") PNone globals, Object locals,
708707
@Cached("create()") ReadCallerFrameNode readCallerFrameNode) {
709708
PCode code = createAndCheckCode(frame, source);
710-
PFrame callerFrame = readCallerFrameNode.executeWith(frame, PArguments.getCallerFrameInfo(frame), FrameInstance.FrameAccess.READ_ONLY, 0);
709+
PFrame callerFrame = readCallerFrameNode.executeWith(frame, 0);
711710
Object[] args = PArguments.create();
712711
inheritGlobals(callerFrame, args);
713712
setCustomLocals(args, locals);

0 commit comments

Comments
 (0)