Improve gi_frame.f_lineno

Author: msimacek

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

@@ -528,8 +528,10 @@ static Object getFrame(PGenerator self,
                 MaterializedFrame generatorFrame = PArguments.getGeneratorFrame(self.getArguments());
                 PDict locals = PArguments.getGeneratorFrameLocals(generatorFrame);
                 Object[] arguments = PArguments.create();
-                // TODO msimacek - this way, the generator will always have lineno == 1
-                Node location = self.getCurrentCallTarget().getRootNode();
+                Node location = self.getCurrentYieldNode();
+                if (location == null) {
+                    location = self.getCurrentCallTarget().getRootNode();
+                }
                 PFrame frame = factory.createPFrame(PFrame.Reference.EMPTY, location, locals, false);
                 PArguments.setGlobals(arguments, PArguments.getGlobals(self.getArguments()));
                 PArguments.setClosure(arguments, PArguments.getClosure(self.getArguments()));

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

@@ -32,6 +32,7 @@
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.iterator.PRangeIterator;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
+import com.oracle.graal.python.nodes.generator.AbstractYieldNode;
 import com.oracle.graal.python.parser.ExecutionCellSlots;
 import com.oracle.graal.python.parser.GeneratorInfo;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
@@ -66,6 +67,7 @@ public final class PGenerator extends PythonBuiltinObject {
     private int currentCallTarget;
     private final Object iterator;
     private final boolean isPRangeIterator;
+    private final GeneratorInfo generatorInfo;
     // running means it is currently on the stack, not just started
     private boolean running;
 
@@ -97,7 +99,7 @@ public static PGenerator create(String name, String qualname, RootCallTarget[] c
         }
         assignCells(generatorFrame, cellVarSlots, cellVarAssumptions);
         PArguments.setGeneratorFrameLocals(generatorFrameArguments, factory.createDictLocals(generatorFrame));
-        return new PGenerator(name, qualname, callTargets, frameDescriptor, arguments, closure, iterator);
+        return new PGenerator(name, qualname, callTargets, generatorInfo, frameDescriptor, arguments, closure, iterator);
     }
 
     @ExplodeLoop
@@ -116,11 +118,12 @@ private static void assignClosure(PCell[] closure, MaterializedFrame generatorFr
         }
     }
 
-    private PGenerator(String name, String qualname, RootCallTarget[] callTargets, FrameDescriptor frameDescriptor, Object[] arguments, PCell[] closure, Object iterator) {
+    private PGenerator(String name, String qualname, RootCallTarget[] callTargets, GeneratorInfo generatorInfo, FrameDescriptor frameDescriptor, Object[] arguments, PCell[] closure, Object iterator) {
         super(PythonBuiltinClassType.PGenerator, PythonBuiltinClassType.PGenerator.newInstance());
         this.name = name;
         this.qualname = qualname;
         this.callTargets = callTargets;
+        this.generatorInfo = generatorInfo;
         this.currentCallTarget = 0;
         this.frameDescriptor = frameDescriptor;
         this.arguments = arguments;
@@ -147,6 +150,15 @@ public RootCallTarget getCurrentCallTarget() {
         return callTargets[currentCallTarget];
     }
 
+    public AbstractYieldNode getCurrentYieldNode() {
+        if (currentCallTarget == 0 || running || finished) {
+            // Not stopped on a yield
+            return null;
+        }
+        // Call target indices are yield indices + 1, see AbstractYieldNode
+        return generatorInfo.getYieldNodes()[currentCallTarget - 1];
+    }
+
     public boolean isStarted() {
         return currentCallTarget != 0 && !running;
     }