Fix: Consider Python internal frame when searching current frame on stack.

fangerer · fangerer · commit 5115e7364a33 · 2020-01-09T23:34:21.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java
@@ -2302,11 +2302,11 @@ void doWithoutFrame(@SuppressWarnings("unused") Frame frame, PException e,
                 // the info on the next call
                 flag[0] = ConditionProfile.createBinaryProfile();
                 if (ref == null) {
-                    ref = PArguments.getCurrentFrameInfo(ReadCallerFrameNode.getCallerFrame(null, FrameInstance.FrameAccess.READ_ONLY, true, 0));
+                    ref = PArguments.getCurrentFrameInfo(ReadCallerFrameNode.getCallerFrame(null, FrameInstance.FrameAccess.READ_ONLY, false, 0));
                 }
             }
             if (flag[0].profile(ref == null)) {
-                ref = PArguments.getCurrentFrameInfo(ReadCallerFrameNode.getCallerFrame(null, FrameInstance.FrameAccess.READ_ONLY, true, 0));
+                ref = PArguments.getCurrentFrameInfo(ReadCallerFrameNode.getCallerFrame(null, FrameInstance.FrameAccess.READ_ONLY, false, 0));
             }
             transformToNative(context, ref, e);
         }

Original file line number	Diff line number	Diff line change
`@@ -2302,11 +2302,11 @@ void doWithoutFrame(@SuppressWarnings("unused") Frame frame, PException e,`
`2302`	`2302`	`// the info on the next call`
`2303`	`2303`	`flag[0] = ConditionProfile.createBinaryProfile();`
`2304`	`2304`	`if (ref == null) {`
`2305`		`- ref = PArguments.getCurrentFrameInfo(ReadCallerFrameNode.getCallerFrame(null, FrameInstance.FrameAccess.READ_ONLY, true, 0));`
	`2305`	`+ ref = PArguments.getCurrentFrameInfo(ReadCallerFrameNode.getCallerFrame(null, FrameInstance.FrameAccess.READ_ONLY, false, 0));`
`2306`	`2306`	`}`
`2307`	`2307`	`}`
`2308`	`2308`	`if (flag[0].profile(ref == null)) {`
`2309`		`- ref = PArguments.getCurrentFrameInfo(ReadCallerFrameNode.getCallerFrame(null, FrameInstance.FrameAccess.READ_ONLY, true, 0));`
	`2309`	`+ ref = PArguments.getCurrentFrameInfo(ReadCallerFrameNode.getCallerFrame(null, FrameInstance.FrameAccess.READ_ONLY, false, 0));`
`2310`	`2310`	`}`
`2311`	`2311`	`transformToNative(context, ref, e);`
`2312`	`2312`	`}`