[GR-21590] Update imports

PullRequest: graalpython/2423

Author: otethal

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "55b5a0614a8d46864bb0197b92d2e20033e58ed7" }
+{ "overlay": "2cd069137637587d926bf791fd2003912df2368b" }

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

@@ -59,12 +59,12 @@ public PBytecodeRootNode getRootNode() {
         return rootNode;
     }
 
-    public int bciToLine(int bci) {
-        return rootNode.bciToLine(bci);
-    }
-
     public int getBci(Frame frame) {
-        return frame.getIntStatic(rootNode.bcioffset);
+        if (frame.isInt(rootNode.bcioffset)) {
+            return frame.getInt(rootNode.bcioffset);
+        } else {
+            return -1;
+        }
     }
 
     public Object getYieldFrom(Frame generatorFrame, int bci, int stackTop) {
@@ -76,10 +76,6 @@ public Object getYieldFrom(Frame generatorFrame, int bci, int stackTop) {
         return null;
     }
 
-    public int getLineno(Frame frame) {
-        return bciToLine(getBci(frame));
-    }
-
     public int getVariableCount() {
         CodeUnit code = rootNode.getCodeUnit();
         return code.varnames.length + code.cellvars.length + code.freevars.length;

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

@@ -542,7 +542,8 @@ private static FrameDescriptor makeFrameDescriptor(CodeUnit co, FrameInfo info)
         // stack
         newBuilder.addSlots(co.stacksize, FrameSlotKind.Illegal);
         // BCI filled when unwinding the stack or when pausing generators
-        newBuilder.addSlot(FrameSlotKind.Static, null, null);
+        // TODO we should use a static slot when GR-40849 and GR-40742 are fixed
+        newBuilder.addSlot(FrameSlotKind.Int, null, null);
         if (co.isGeneratorOrCoroutine()) {
             // stackTop saved when pausing a generator
             newBuilder.addSlot(FrameSlotKind.Int, null, null);
@@ -2443,7 +2444,7 @@ private void unboxVariables(Frame localFrame) {
     }
 
     private static void setCurrentBci(VirtualFrame virtualFrame, int bciSlot, int bci) {
-        virtualFrame.setIntStatic(bciSlot, bci);
+        virtualFrame.setInt(bciSlot, bci);
     }
 
     private boolean bytecodePopCondition(VirtualFrame virtualFrame, int stackTop, Node[] localNodes, int bci, boolean useCachedNodes) {

mx.graalpython/suite.py

@@ -44,23 +44,23 @@
             },
             {
                 "name": "tools",
-                "version": "35137ce8c2a604b2b2c7de6c3333052432234e25",
+                "version": "96d195f5bf3e3c6953f8823e47b7f73d2c04dba8",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "35137ce8c2a604b2b2c7de6c3333052432234e25",
+                "version": "96d195f5bf3e3c6953f8823e47b7f73d2c04dba8",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "35137ce8c2a604b2b2c7de6c3333052432234e25",
+                "version": "96d195f5bf3e3c6953f8823e47b7f73d2c04dba8",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},