Fix throw into unstarted generator

Author: msimacek

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

@@ -496,6 +496,10 @@ private Object doThrow(VirtualFrame frame, ResumeGeneratorNode resumeGeneratorNo
                 Node location = self.getCurrentCallTarget().getRootNode();
                 MaterializedFrame generatorFrame = PArguments.getGeneratorFrame(self.getArguments());
                 PFrame pFrame = ensureMaterializeFrameNode().execute(null, location, false, false, generatorFrame);
+                if (self.usesBytecode()) {
+                    FrameInfo info = (FrameInfo) generatorFrame.getFrameDescriptor().getInfo();
+                    pFrame.setLine(info.getRootNode().getFirstLineno());
+                }
                 PTraceback existingTraceback = null;
                 if (instance.getTraceback() != null) {
                     existingTraceback = ensureGetTracebackNode().execute(instance.getTraceback());

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/CompilationUnit.java

@@ -87,7 +87,8 @@ public final class CompilationUnit {
     Block currentBlock = startBlock;
     int maxStackSize = 0;
 
-    int startOffset;
+    final int startOffset;
+    int currentOffset;
 
     CompilationUnit(CompilationScope scopeType, Scope scope, String name, CompilationUnit parent, int scopeDepth, int argCount, int positionalOnlyArgCount, int kwOnlyArgCount, boolean takesVarArgs,
                     boolean takesVarKeywordArgs, int startOffset) {
@@ -100,6 +101,7 @@ public final class CompilationUnit {
         this.takesVarArgs = takesVarArgs;
         this.takesVarKeywordArgs = takesVarKeywordArgs;
         this.startOffset = startOffset;
+        currentOffset = startOffset;
 
         if (scopeType == Class) {
             privateName = name;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/Compiler.java

@@ -292,22 +292,22 @@ private boolean containsAnnotations(StmtTy[] stmts) {
     }
 
     private Void addOp(OpCodes code) {
-        addOp(code, 0, null, unit.startOffset);
+        addOp(code, 0, null, unit.currentOffset);
         return null;
     }
 
     private void addOp(OpCodes code, Block target) {
         Block b = unit.currentBlock;
-        b.instr.add(new Instruction(code, 0, null, target, unit.startOffset));
+        b.instr.add(new Instruction(code, 0, null, target, unit.currentOffset));
     }
 
     private Void addOp(OpCodes code, int arg) {
-        addOp(code, arg, null, unit.startOffset);
+        addOp(code, arg, null, unit.currentOffset);
         return null;
     }
 
     private Void addOp(OpCodes code, int arg, byte[] followingArgs) {
-        addOp(code, arg, followingArgs, unit.startOffset);
+        addOp(code, arg, followingArgs, unit.currentOffset);
         return null;
     }
 
@@ -440,8 +440,8 @@ private String getDocstring(StmtTy[] body) {
     }
 
     private int setLocation(int offset) {
-        int savedOffset = unit.startOffset;
-        unit.startOffset = offset;
+        int savedOffset = unit.currentOffset;
+        unit.currentOffset = offset;
         return savedOffset;
     }
 

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

@@ -2256,6 +2256,15 @@ public int bciToLine(int bci) {
         return -1;
     }
 
+    @TruffleBoundary
+    public int getFirstLineno() {
+        if (source != null && source.hasCharacters()) {
+            // TODO the same problem as bciToLine
+            return source.createSection(co.startOffset, 0).getStartLine();
+        }
+        return -1;
+    }
+
     @Override
     public SourceSection getSourceSection() {
         if (sourceSection != null) {