Improve generator inspection

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/GeneratorBuiltins.java

@@ -563,9 +563,14 @@ static Object getFrame(PGenerator self,
                 MaterializedFrame generatorFrame = PArguments.getGeneratorFrame(self.getArguments());
                 PDict locals = PArguments.getGeneratorFrameLocals(generatorFrame);
                 Object[] arguments = PArguments.create();
-                Node location = self.getCurrentYieldNode();
-                if (location == null) {
-                    location = self.getCurrentCallTarget().getRootNode();
+                Node location;
+                if (self.usesBytecode()) {
+                    location = ((PBytecodeRootNode.FrameInfo) generatorFrame.getFrameDescriptor().getInfo()).getRootNode();
+                } else {
+                    location = self.getCurrentYieldNode();
+                    if (location == null) {
+                        location = self.getCurrentCallTarget().getRootNode();
+                    }
                 }
                 PFrame frame = factory.createPFrame(PFrame.Reference.EMPTY, location, locals);
                 PArguments.setGlobals(arguments, PArguments.getGlobals(self.getArguments()));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/PGenerator.java

@@ -211,6 +211,9 @@ public Object getYieldFrom() {
             }
             return null;
         } else {
+            if (running) {
+                return null;
+            }
             return frameInfo.getYieldFrom(PArguments.getGeneratorFrame(arguments));
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/traceback/LazyTraceback.java

@@ -44,6 +44,7 @@
 
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.graal.python.nodes.bytecode.PBytecodeGeneratorRootNode;
 import com.oracle.graal.python.nodes.bytecode.PBytecodeRootNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -144,7 +145,8 @@ public static boolean elementWantedForTraceback(TruffleStackTraceElement element
         Frame frame = element.getFrame();
         // only include frames of non-builtin python functions
         RootNode rootNode = element.getTarget().getRootNode();
-        return PArguments.isPythonFrame(frame) && locationWantedForTraceback(rootNode instanceof PBytecodeRootNode ? rootNode : element.getLocation());
+        return PArguments.isPythonFrame(frame) &&
+                        locationWantedForTraceback(rootNode instanceof PBytecodeRootNode || rootNode instanceof PBytecodeGeneratorRootNode ? rootNode : element.getLocation());
     }
 
     public boolean catchingFrameWantedForTraceback() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/traceback/TracebackBuiltins.java

@@ -43,6 +43,7 @@
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.frame.PFrame.Reference;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.graal.python.nodes.bytecode.PBytecodeGeneratorRootNode;
 import com.oracle.graal.python.nodes.bytecode.PBytecodeRootNode;
 import com.oracle.graal.python.nodes.frame.MaterializeFrameNode;
 import com.oracle.graal.python.nodes.frame.ReadCallerFrameNode;
@@ -61,6 +62,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
@@ -209,8 +211,9 @@ private static int getLineno(TruffleStackTraceElement element) {
 
         private static PFrame materializeFrame(TruffleStackTraceElement element, MaterializeFrameNode materializeFrameNode) {
             Node location = element.getLocation();
-            if (element.getTarget().getRootNode() instanceof PBytecodeRootNode) {
-                location = element.getTarget().getRootNode();
+            RootNode rootNode = element.getTarget().getRootNode();
+            if (rootNode instanceof PBytecodeRootNode || rootNode instanceof PBytecodeGeneratorRootNode) {
+                location = rootNode;
             }
             // create the PFrame and refresh frame values
             return materializeFrameNode.execute(null, location, false, true, element.getFrame());

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -768,7 +768,8 @@ public void createGeneratorFrame(Object[] arguments) {
         PArguments.setCallerFrameInfo(arguments, null);
         PArguments.setControlData(arguments, GENERATOR_CONTROL_DATA);
         PArguments.setGeneratorFrameLocals(generatorFrameArguments, factory.createDictLocals(generatorFrame));
-        generatorFrame.setInt(bcioffset, 0);
+        // This is just for inspection, unstarted generators should have bci == -1
+        generatorFrame.setInt(bcioffset, -1);
         generatorFrame.setInt(generatorStackTopOffset, stackoffset - 1);
         copyArgsAndCells(generatorFrame, arguments);
     }
@@ -1458,7 +1459,13 @@ Object executeFromBci(VirtualFrame virtualFrame, int initialBci, int initialStac
                     ExceptionHandlingStatementNode.chainExceptions(pe.getUnreifiedException(), exceptionState, exceptionChainProfile1, exceptionChainProfile2);
                 }
                 if (newTarget == -1) {
-                    localFrame.setInt(bcioffset, beginBci);
+                    // For tracebacks
+                    virtualFrame.setInt(bcioffset, beginBci);
+                    if (isGeneratorOrCoroutine) {
+                        // For generator inspection
+                        localFrame.setInt(bcioffset, beginBci);
+                        localFrame.setInt(generatorStackTopOffset, stackTop);
+                    }
                     if (CompilerDirectives.inInterpreter() && loopCount > 0) {
                         LoopNode.reportLoopCount(this, loopCount);
                     }