Fix: implement missing cases in the generic specialization.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/FrameBuiltins.java

@@ -70,7 +70,7 @@ public abstract static class GetGlobalsNode extends PythonBuiltinNode {
 
         @Specialization
         Object get(VirtualFrame curFrame, PFrame self) {
-            if (self.hasFrame()) {
+            if (self.isAssociated()) {
                 PythonObject globals = self.getGlobals();
                 if (globals instanceof PythonModule) {
                     if (getDictNode == null) {
@@ -152,7 +152,7 @@ Object getUpdating(VirtualFrame frame, PFrame self,
                         @Cached ReadLocalsNode readLocals,
                         @Cached("createBinaryProfile()") ConditionProfile profile,
                         @Cached MaterializeFrameNode materializeNode) {
-            assert self.hasFrame() : "It's impossible to call f_locals on a frame without that frame having escaped";
+            assert self.isAssociated() : "It's impossible to call f_locals on a frame without that frame having escaped";
             // Special case because this builtin can be called without going through an invoke node:
             // we need to sync the values of the frame if and only if 'self' represents the current
             // frame. If 'self' represents another frame on the stack, the values are already

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/PFrame.java

@@ -267,9 +267,11 @@ public boolean isIncomplete() {
     }
 
     /**
-     * When this is true, the frame has escaped
+     * {@code true} if this {@code PFrame} is associated with a {@code Frame}, i.e., it has a frame
+     * info. On the other hand, {@code false} means that this {@code PFrame} has been created
+     * artificially which is most commonly done to carry custom locals.
      **/
-    public boolean hasFrame() {
+    public boolean isAssociated() {
         return virtualFrameInfo != null;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.java

@@ -145,7 +145,7 @@ static PFrame freshPFrameInClassBody(VirtualFrame frame, Node location, boolean
      *
      * @see PFrame#isIncomplete
      **/
-    @Specialization(guards = {"getPFrame(frameToMaterialize) != null", "!getPFrame(frameToMaterialize).hasFrame()"})
+    @Specialization(guards = {"getPFrame(frameToMaterialize) != null", "!getPFrame(frameToMaterialize).isAssociated()"})
     static PFrame incompleteFrame(VirtualFrame frame, Node location, boolean markAsEscaped, boolean forceSync, Frame frameToMaterialize,
                     @Shared("factory") @Cached("createFactory()") PythonObjectFactory factory,
                     @Shared("syncValuesNode") @Cached("createSyncNode()") SyncFrameValuesNode syncValuesNode) {
@@ -154,7 +154,7 @@ static PFrame incompleteFrame(VirtualFrame frame, Node location, boolean markAsE
         return doEscapeFrame(frame, frameToMaterialize, escapedFrame, markAsEscaped, forceSync && !inModuleRoot(location), syncValuesNode);
     }
 
-    @Specialization(guards = {"getPFrame(frameToMaterialize) != null", "getPFrame(frameToMaterialize).hasFrame()"}, replaces = "freshPFrame")
+    @Specialization(guards = {"getPFrame(frameToMaterialize) != null", "getPFrame(frameToMaterialize).isAssociated()"}, replaces = "freshPFrame")
     static PFrame alreadyEscapedFrame(VirtualFrame frame, Node location, boolean markAsEscaped, boolean forceSync, Frame frameToMaterialize,
                     @Shared("syncValuesNode") @Cached("createSyncNode()") SyncFrameValuesNode syncValuesNode,
                     @Cached("createBinaryProfile()") ConditionProfile syncProfile) {
@@ -170,16 +170,23 @@ static PFrame alreadyEscapedFrame(VirtualFrame frame, Node location, boolean mar
         return pyFrame;
     }
 
-    @Specialization(replaces = {"freshPFrame", "alreadyEscapedFrame"})
-    static PFrame notInClassBody(VirtualFrame frame, Node location, boolean markAsEscaped, boolean forceSync, Frame frameToMaterialize,
+    @Specialization(replaces = {"freshPFrame", "alreadyEscapedFrame", "incompleteFrame"})
+    static PFrame generic(VirtualFrame frame, Node location, boolean markAsEscaped, boolean forceSync, Frame frameToMaterialize,
                     @Shared("factory") @Cached("createFactory()") PythonObjectFactory factory,
                     @Shared("syncValuesNode") @Cached("createSyncNode()") SyncFrameValuesNode syncValuesNode,
                     @Cached("createBinaryProfile()") ConditionProfile syncProfile) {
-        if (getPFrame(frameToMaterialize) != null) {
-            return alreadyEscapedFrame(frame, location, markAsEscaped, forceSync, frameToMaterialize, syncValuesNode, syncProfile);
+        PFrame pyFrame = getPFrame(frameToMaterialize);
+        if (pyFrame != null) {
+            if (pyFrame.isAssociated()) {
+                return alreadyEscapedFrame(frame, location, markAsEscaped, forceSync, frameToMaterialize, syncValuesNode, syncProfile);
+            } else {
+                return incompleteFrame(frame, location, markAsEscaped, forceSync, frameToMaterialize, factory, syncValuesNode);
+            }
         } else {
             if (inClassBody(frameToMaterialize)) {
                 return freshPFrameInClassBody(frame, location, markAsEscaped, forceSync, frameToMaterialize, factory, syncValuesNode);
+            } else if (isGeneratorFrame(frameToMaterialize)) {
+                return freshPFrameForGenerator(location, markAsEscaped, forceSync, frameToMaterialize, factory);
             } else {
                 return freshPFrame(frame, location, markAsEscaped, forceSync, frameToMaterialize, factory, syncValuesNode);
             }