[GR-10526] Bump imports and fix deprecations

PullRequest: graalpython/125

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/FrameSlotNode.java

@@ -84,58 +84,50 @@ protected final Object getObject(Frame frame) {
         return FrameUtil.getObjectSafe(frame, frameSlot);
     }
 
-    @SuppressWarnings("unused")
     protected final boolean isNotIllegal(Frame frame) {
-        return frameSlot.getKind() != FrameSlotKind.Illegal;
+        return frame.getFrameDescriptor().getFrameSlotKind(frameSlot) != FrameSlotKind.Illegal;
     }
 
-    @SuppressWarnings("unused")
     protected final boolean isBooleanKind(Frame frame) {
-        return isKind(FrameSlotKind.Boolean);
+        return isKind(frame, FrameSlotKind.Boolean);
     }
 
-    @SuppressWarnings("unused")
     protected final boolean isIntegerKind(Frame frame) {
-        return isKind(FrameSlotKind.Int);
+        return isKind(frame, FrameSlotKind.Int);
     }
 
-    @SuppressWarnings("unused")
     protected final boolean isLongKind(Frame frame) {
-        return isKind(FrameSlotKind.Long);
+        return isKind(frame, FrameSlotKind.Long);
     }
 
-    @SuppressWarnings("unused")
     protected final boolean isDoubleKind(Frame frame) {
-        return isKind(FrameSlotKind.Double);
+        return isKind(frame, FrameSlotKind.Double);
     }
 
-    @SuppressWarnings("unused")
     protected final boolean isIntOrObjectKind(Frame frame) {
-        return isKind(FrameSlotKind.Int) || isKind(FrameSlotKind.Object);
+        return isKind(frame, FrameSlotKind.Int) || isKind(frame, FrameSlotKind.Object);
     }
 
-    @SuppressWarnings("unused")
     protected final boolean isLongOrObjectKind(Frame frame) {
-        return isKind(FrameSlotKind.Long) || isKind(FrameSlotKind.Object);
+        return isKind(frame, FrameSlotKind.Long) || isKind(frame, FrameSlotKind.Object);
     }
 
-    @SuppressWarnings("unused")
     protected final boolean isObjectKind(Frame frame) {
-        if (frameSlot.getKind() != FrameSlotKind.Object) {
+        if (frame.getFrameDescriptor().getFrameSlotKind(frameSlot) != FrameSlotKind.Object) {
             CompilerDirectives.transferToInterpreter();
-            frameSlot.setKind(FrameSlotKind.Object);
+            frame.getFrameDescriptor().setFrameSlotKind(frameSlot, FrameSlotKind.Object);
         }
         return true;
     }
 
-    private boolean isKind(FrameSlotKind kind) {
-        return frameSlot.getKind() == kind || initialSetKind(kind);
+    private boolean isKind(Frame frame, FrameSlotKind kind) {
+        return frame.getFrameDescriptor().getFrameSlotKind(frameSlot) == kind || initialSetKind(frame, kind);
     }
 
-    private boolean initialSetKind(FrameSlotKind kind) {
-        if (frameSlot.getKind() == FrameSlotKind.Illegal) {
+    private boolean initialSetKind(Frame frame, FrameSlotKind kind) {
+        if (frame.getFrameDescriptor().getFrameSlotKind(frameSlot) == FrameSlotKind.Illegal) {
             CompilerDirectives.transferToInterpreter();
-            frameSlot.setKind(kind);
+            frame.getFrameDescriptor().setFrameSlotKind(frameSlot, kind);
             return true;
         }
         return false;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/WriteLocalVariableNode.java

@@ -116,14 +116,14 @@ public int write(VirtualFrame frame, int value) {
 
     @Specialization(guards = {"isLongOrObjectKind(frame)", "isPrimitiveInt(value)"}, rewriteOn = ArithmeticException.class)
     public PInt writePIntAsLong(VirtualFrame frame, PInt value) {
+        frame.getFrameDescriptor().setFrameSlotKind(frameSlot, FrameSlotKind.Long);
         frame.setLong(frameSlot, value.longValueExact());
-        frameSlot.setKind(FrameSlotKind.Long);
         return value;
     }
 
     @Specialization(guards = "isLongOrObjectKind(frame)")
     public PInt writePIntAsObject(VirtualFrame frame, PInt value) {
-        frameSlot.setKind(FrameSlotKind.Object);
+        frame.getFrameDescriptor().setFrameSlotKind(frameSlot, FrameSlotKind.Object);
         frame.setObject(frameSlot, value);
         return value;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/WriteGeneratorFrameVariableNode.java

@@ -121,15 +121,15 @@ public int write(VirtualFrame frame, int value) {
     @Specialization(guards = {"isLongOrObjectKind(frame)", "isPrimitiveInt(value)"}, rewriteOn = ArithmeticException.class)
     public PInt writePIntAsLong(VirtualFrame frame, PInt value) {
         Frame generatorFrame = PArguments.getGeneratorFrame(frame);
-        frameSlot.setKind(FrameSlotKind.Long);
+        generatorFrame.getFrameDescriptor().setFrameSlotKind(frameSlot, FrameSlotKind.Long);
         generatorFrame.setLong(frameSlot, value.longValueExact());
         return value;
     }
 
     @Specialization(guards = "isLongOrObjectKind(frame)")
     public PInt writePIntAsObject(VirtualFrame frame, PInt value) {
         Frame generatorFrame = PArguments.getGeneratorFrame(frame);
-        frameSlot.setKind(FrameSlotKind.Object);
+        generatorFrame.getFrameDescriptor().setFrameSlotKind(frameSlot, FrameSlotKind.Object);
         generatorFrame.setObject(frameSlot, value);
         return value;
     }

mx.graalpython/suite.py

@@ -25,14 +25,14 @@
             },
             {
                 "name": "sulong",
-                "version": "128139f4b55c15cc090f9cb26a7eb775c44e3f3f",
+                "version": "eb3cf4bc0abb0c98c53ae7a93dc75b01d1846d83",
                 "urls": [
                     {"url": "https://github.com/graalvm/sulong", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "b849b28aadc29a9efa0247a40bf88898978f0ceb",
+                "version": "337a2747a1d750693853cc7c8f6ec2aaa2afc4ba",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},