Save the current bci every bytecode loop

Author: msimacek

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

@@ -63,10 +63,7 @@ public int bciToLine(int bci) {
     }
 
     public int getBci(Frame frame) {
-        if (frame.isInt(rootNode.bcioffset)) {
-            return frame.getInt(rootNode.bcioffset);
-        }
-        return -1;
+        return frame.getIntStatic(rootNode.bcioffset);
     }
 
     public Object getYieldFrom(Frame generatorFrame, int bci, int stackTop) {

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

@@ -416,7 +416,7 @@ private static FrameDescriptor makeFrameDescriptor(CodeUnit co) {
         // stack
         newBuilder.addSlots(co.stacksize, FrameSlotKind.Illegal);
         // BCI filled when unwinding the stack or when pausing generators
-        newBuilder.addSlot(FrameSlotKind.Int, null, null);
+        newBuilder.addSlot(FrameSlotKind.Static, null, null);
         if (co.isGeneratorOrCoroutine()) {
             // stackTop saved when pausing a generator
             newBuilder.addSlot(FrameSlotKind.Int, null, null);
@@ -754,6 +754,9 @@ Object executeFromBci(VirtualFrame virtualFrame, Frame localFrame, Frame stackFr
         long[] localLongConsts = longConsts;
         String[] localNames = names;
         Node[] localNodes = adoptedNodes;
+        final int bciSlot = bcioffset;
+
+        virtualFrame.setIntStatic(bciSlot, initialBci);
 
         /*
          * This separate tracking of local exception is necessary to make exception state saving
@@ -775,6 +778,7 @@ Object executeFromBci(VirtualFrame virtualFrame, Frame localFrame, Frame stackFr
         while (true) {
             final byte bc = localBC[bci];
             final int beginBci = bci;
+            virtualFrame.setIntStatic(bciSlot, bci);
 
             CompilerAsserts.partialEvaluationConstant(bc);
             CompilerAsserts.partialEvaluationConstant(bci);
@@ -1409,7 +1413,7 @@ Object executeFromBci(VirtualFrame virtualFrame, Frame localFrame, Frame stackFr
                 }
                 if (newTarget == -1) {
                     // For tracebacks
-                    virtualFrame.setInt(bcioffset, beginBci);
+                    virtualFrame.setIntStatic(bciSlot, beginBci);
                     if (isGeneratorOrCoroutine) {
                         if (localFrame != stackFrame) {
                             // Unwind the generator frame stack