Fix moving lineno of the current frame

Author: msimacek

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

@@ -74,15 +74,17 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     public abstract static class ReprNode extends PythonUnaryBuiltinNode {
         @Specialization
         String repr(VirtualFrame frame, PFrame self,
-                        @Cached GetCodeNode getCodeNode) {
+                        @Cached GetCodeNode getCodeNode,
+                        @Cached GetLinenoNode getLinenoNode) {
             PCode code = getCodeNode.executeObject(frame, self);
-            return getFormat(self, code);
+            int lineno = getLinenoNode.executeInt(frame, self);
+            return getFormat(self, code, lineno);
         }
 
         @TruffleBoundary
-        private static String getFormat(PFrame self, PCode code) {
+        private static String getFormat(PFrame self, PCode code, int lineno) {
             return String.format("<frame at 0x%x, file %s, line %d, code %s>",
-                            self.hashCode(), code.getFilename(), self.getLine(), code.getName());
+                            self.hashCode(), code.getFilename(), lineno, code.getName());
         }
     }
 
@@ -124,10 +126,26 @@ Object get(VirtualFrame frame, @SuppressWarnings("unused") PFrame self) {
     @Builtin(name = "f_lineno", minNumOfPositionalArgs = 1, isGetter = true)
     @GenerateNodeFactory
     public abstract static class GetLinenoNode extends PythonBuiltinNode {
+        public abstract int executeInt(VirtualFrame frame, PFrame self);
+
         @Specialization
-        int get(PFrame self) {
+        int get(VirtualFrame frame, PFrame self,
+                        @Cached ConditionProfile isCurrentFrameProfile,
+                        @Cached MaterializeFrameNode materializeNode) {
+            // Special case because this builtin can be called without going through an invoke node:
+            // we need to sync the location of the frame if and only if 'self' represents the
+            // current frame. If 'self' represents another frame on the stack, the location is
+            // already set
+            if (isCurrentFrameProfile.profile(PArguments.getCurrentFrameInfo(frame) == self.getRef())) {
+                PFrame pyFrame = materializeNode.execute(frame, this, false, false);
+                assert pyFrame == self;
+            }
             return self.getLine();
         }
+
+        public static GetLinenoNode create() {
+            return FrameBuiltinsFactory.GetLinenoNodeFactory.create(new ReadArgumentNode[0]);
+        }
     }
 
     @Builtin(name = "f_lasti", minNumOfPositionalArgs = 1, isGetter = true)

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

@@ -226,9 +226,10 @@ public int getLine() {
             } else {
                 SourceSection sourceSection = location.getEncapsulatingSourceSection();
                 if (sourceSection == null) {
-                    line = -1;
+                    return -1;
                 } else {
-                    line = sourceSection.getStartLine();
+                    // The location can change, so we shouldn't cache the value
+                    return sourceSection.getStartLine();
                 }
             }
         }