Fix: ignore custom locals if it is a frame info object.

fangerer · fangerer · commit ae7f56f455d2 · 2019-06-06T13:42:46.000+02:00
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
@@ -141,9 +141,8 @@ public static void enter(VirtualFrame frame, BranchProfile profile) {
             PArguments.setCurrentFrameInfo(frame, thisFrameRef);
             // tfel: If there are custom locals, write them into an (incomplete)
             // PFrame here
-            if (customLocals != null) {
+            if (customLocals != null && !(customLocals instanceof PFrame.Reference)) {
                 profile.enter();
-                assert !(customLocals instanceof PFrame.Reference);
                 thisFrameRef.setCustomLocals(customLocals);
             }
         }
@@ -191,8 +190,6 @@ public void exit(VirtualFrame frame, PRootNode node) {
                 callerInfo.markAsEscaped();
                 info.setBackref(callerInfo);
             }
-            // explicitly clear current frame info
-            PArguments.setCurrentFrameInfo(frame, null);
         }
 
         private MaterializeFrameNode ensureMaterializeNode() {

Original file line number	Diff line number	Diff line change
`@@ -141,9 +141,8 @@ public static void enter(VirtualFrame frame, BranchProfile profile) {`
`141`	`141`	`PArguments.setCurrentFrameInfo(frame, thisFrameRef);`
`142`	`142`	`// tfel: If there are custom locals, write them into an (incomplete)`
`143`	`143`	`// PFrame here`
`144`		`- if (customLocals != null) {`
	`144`	`+ if (customLocals != null && !(customLocals instanceof PFrame.Reference)) {`
`145`	`145`	`profile.enter();`
`146`		`- assert !(customLocals instanceof PFrame.Reference);`
`147`	`146`	`thisFrameRef.setCustomLocals(customLocals);`
`148`	`147`	`}`
`149`	`148`	`}`
`@@ -191,8 +190,6 @@ public void exit(VirtualFrame frame, PRootNode node) {`
`191`	`190`	`callerInfo.markAsEscaped();`
`192`	`191`	`info.setBackref(callerInfo);`
`193`	`192`	`}`
`194`		`- // explicitly clear current frame info`
`195`		`- PArguments.setCurrentFrameInfo(frame, null);`
`196`	`193`	`}`
`197`	`194`
`198`	`195`	`private MaterializeFrameNode ensureMaterializeNode() {`