Fix: Reset current frame info to avoid PFrame allocations.

fangerer · fangerer · commit 6daa6421e943 · 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
@@ -143,6 +143,7 @@ public static void enter(VirtualFrame frame, BranchProfile profile) {
             // PFrame here
             if (customLocals != null) {
                 profile.enter();
+                assert !(customLocals instanceof PFrame.Reference);
                 thisFrameRef.setCustomLocals(customLocals);
             }
         }
@@ -190,6 +191,8 @@ 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
`@@ -143,6 +143,7 @@ public static void enter(VirtualFrame frame, BranchProfile profile) {`
`143`	`143`	`// PFrame here`
`144`	`144`	`if (customLocals != null) {`
`145`	`145`	`profile.enter();`
	`146`	`+ assert !(customLocals instanceof PFrame.Reference);`
`146`	`147`	`thisFrameRef.setCustomLocals(customLocals);`
`147`	`148`	`}`
`148`	`149`	`}`
`@@ -190,6 +191,8 @@ public void exit(VirtualFrame frame, PRootNode node) {`
`190`	`191`	`callerInfo.markAsEscaped();`
`191`	`192`	`info.setBackref(callerInfo);`
`192`	`193`	`}`
	`194`	`+ // explicitly clear current frame info`
	`195`	`+ PArguments.setCurrentFrameInfo(frame, null);`
`193`	`196`	`}`
`194`	`197`
`195`	`198`	`private MaterializeFrameNode ensureMaterializeNode() {`