CodeUnit: propagate source line number to PCode level

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java

@@ -1184,8 +1184,9 @@ private CodeUnit readCodeUnit() {
             long[] primitiveConstants = readLongArray();
             short[] exceptionHandlerRanges = readShortArray();
             int startOffset = readInt();
+            int startLine = readInt();
             return new CodeUnit(name, qualname, argCount, kwOnlyArgCount, positionalOnlyArgCount, stacksize, code, srcOffsetTable,
-                            flags, names, varnames, cellvars, freevars, cell2arg, constants, primitiveConstants, exceptionHandlerRanges, startOffset);
+                            flags, names, varnames, cellvars, freevars, cell2arg, constants, primitiveConstants, exceptionHandlerRanges, startOffset, startLine);
         }
 
         private void writeCodeUnit(CodeUnit code) throws IOException {
@@ -1212,6 +1213,7 @@ private void writeCodeUnit(CodeUnit code) throws IOException {
             writeLongArray(code.primitiveConstants);
             writeShortArray(code.exceptionHandlerRanges);
             writeInt(code.startOffset);
+            writeInt(code.startLine);
         }
 
         private PCode readCode() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java

@@ -253,7 +253,7 @@ private static String getSourceSectionFileName(SourceSection src) {
     private static int extractFirstLineno(RootNode rootNode) {
         RootNode funcRootNode = rootNodeForExtraction(rootNode);
         if (funcRootNode instanceof PBytecodeRootNode) {
-            return ((PBytecodeRootNode) funcRootNode).getStartOffset();
+            return ((PBytecodeRootNode) funcRootNode).getCodeUnit().startLine;
         }
         SourceSection sourceSection = funcRootNode.getSourceSection();
         if (sourceSection != null) {

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

@@ -97,6 +97,7 @@ public final class CodeUnit {
     public final short[] exceptionHandlerRanges;
 
     public final int startOffset;
+    public final int startLine;
 
     public final boolean lambda;
 
@@ -105,7 +106,7 @@ public CodeUnit(TruffleString name, TruffleString qualname,
                     byte[] code, byte[] linetable, int flags,
                     TruffleString[] names, TruffleString[] varnames, TruffleString[] cellvars, TruffleString[] freevars, int[] cell2arg,
                     Object[] constants, long[] primitiveConstants,
-                    short[] exceptionHandlerRanges, int startOffset) {
+                    short[] exceptionHandlerRanges, int startOffset, int startLine) {
         this.name = name;
         this.qualname = qualname != null ? qualname : name;
         this.argCount = argCount;
@@ -124,6 +125,7 @@ public CodeUnit(TruffleString name, TruffleString qualname,
         this.primitiveConstants = primitiveConstants;
         this.exceptionHandlerRanges = exceptionHandlerRanges;
         this.startOffset = startOffset;
+        this.startLine = startLine;
         this.lambda = name.equalsUncached(BuiltinNames.T_LAMBDA_NAME, TS_ENCODING);
     }
 

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

@@ -260,7 +260,8 @@ public CodeUnit assemble(int flags) {
                         orderedKeys(constants, new Object[0]),
                         orderedLong(primitiveConstants),
                         exceptionHandlerRanges,
-                        startLocation.startOffset);
+                        startLocation.startOffset,
+                        startLocation.startLine);
     }
 
     private void addExceptionRange(Collection<short[]> finishedExceptionHandlerRanges, int start, int end, int handler, int stackLevel) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -1098,7 +1098,7 @@ public final PCode createCode(RootCallTarget ct, int flags, int firstlineno, byt
 
     public final PCode createCode(RootCallTarget callTarget, Signature signature, CodeUnit codeUnit) {
         return createCode(callTarget, signature, codeUnit.varnames.length, codeUnit.stacksize, -1, codeUnit.constants, codeUnit.names,
-                        codeUnit.varnames, codeUnit.freevars, codeUnit.cellvars, null, codeUnit.name, codeUnit.startOffset, codeUnit.srcOffsetTable);
+                        codeUnit.varnames, codeUnit.freevars, codeUnit.cellvars, null, codeUnit.name, codeUnit.startLine, codeUnit.srcOffsetTable);
     }
 
     public final PCode createCode(RootCallTarget callTarget, Signature signature, int nlocals, int stacksize, int flags, Object[] constants, Object[] names, Object[] varnames,