don't switch to object kind in guards

Author: lukasstadler

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

@@ -104,7 +104,7 @@ protected final boolean isLongOrObjectKind(Frame frame) {
         return isKind(frame, FrameSlotKind.Long) || isKind(frame, FrameSlotKind.Object);
     }
 
-    protected final boolean isOrSetObjectKind(Frame frame) {
+    protected final boolean ensureObjectKind(Frame frame) {
         if (frame.getFrameDescriptor().getFrameSlotKind(frameSlot) != FrameSlotKind.Object) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             frame.getFrameDescriptor().setFrameSlotKind(frameSlot, FrameSlotKind.Object);

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

@@ -82,9 +82,9 @@ public final boolean executeBoolean(VirtualFrame frame) {
         public abstract Object executeWith(VirtualFrame frame, Object value);
 
         @Specialization(guards = "isBooleanKind(frame)")
-        public boolean write(VirtualFrame frame, boolean right) {
-            frame.setBoolean(frameSlot, right);
-            return right;
+        public boolean write(VirtualFrame frame, boolean value) {
+            frame.setBoolean(frameSlot, value);
+            return value;
         }
 
         @Specialization(guards = "isIntegerKind(frame)")
@@ -100,23 +100,25 @@ public long writeSmallPIntAsLong(VirtualFrame frame, PInt value) {
             return longValue;
         }
 
-        @Specialization(guards = {"isPrimitiveInt(value)", "!value.isNative()", "isOrSetObjectKind(frame)"}, rewriteOn = ArithmeticException.class)
+        @Specialization(guards = {"isPrimitiveInt(value)", "!value.isNative()"}, rewriteOn = ArithmeticException.class)
         public long writeSmallPIntAsObject(VirtualFrame frame, PInt value) {
+            ensureObjectKind(frame);
             long longValue = value.longValueExact();
             frame.setObject(frameSlot, longValue);
             return longValue;
         }
 
         @Specialization(guards = "isDoubleKind(frame)")
-        public double write(VirtualFrame frame, double right) {
-            frame.setDouble(frameSlot, right);
-            return right;
+        public double write(VirtualFrame frame, double value) {
+            frame.setDouble(frameSlot, value);
+            return value;
         }
 
-        @Specialization(guards = "isOrSetObjectKind(frame)")
-        public Object write(VirtualFrame frame, Object right) {
-            frame.setObject(frameSlot, right);
-            return right;
+        @Specialization
+        public Object write(VirtualFrame frame, Object value) {
+            ensureObjectKind(frame);
+            frame.setObject(frameSlot, value);
+            return value;
         }
     }
 

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

@@ -26,7 +26,6 @@
 package com.oracle.graal.python.nodes.generator;
 
 import com.oracle.graal.python.builtins.objects.function.PArguments;
-import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.frame.FrameSlotNode;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
@@ -61,9 +60,9 @@ private Frame getCargoFrame(VirtualFrame frame) {
     }
 
     @Specialization(guards = "isBooleanKind(frame)")
-    public boolean write(VirtualFrame frame, boolean right) {
-        getCargoFrame(frame).setBoolean(frameSlot, right);
-        return right;
+    public boolean write(VirtualFrame frame, boolean value) {
+        getCargoFrame(frame).setBoolean(frameSlot, value);
+        return value;
     }
 
     @Specialization(guards = "isIntegerKind(frame)")
@@ -72,27 +71,22 @@ public int doInteger(VirtualFrame frame, int value) {
         return value;
     }
 
-    @Specialization(guards = "isIntOrObjectKind(frame)")
-    public PInt write(VirtualFrame frame, PInt value) {
-        setObject(getCargoFrame(frame), value);
-        return value;
-    }
-
     @Specialization(guards = "isLongKind(frame)")
     public long doLong(VirtualFrame frame, long value) {
         getCargoFrame(frame).setLong(frameSlot, value);
         return value;
     }
 
     @Specialization(guards = "isDoubleKind(frame)")
-    public double doDouble(VirtualFrame frame, double right) {
-        getCargoFrame(frame).setDouble(frameSlot, right);
-        return right;
+    public double doDouble(VirtualFrame frame, double value) {
+        getCargoFrame(frame).setDouble(frameSlot, value);
+        return value;
     }
 
-    @Specialization(guards = "isOrSetObjectKind(frame)")
-    public Object write(VirtualFrame frame, Object right) {
-        setObject(getCargoFrame(frame), right);
-        return right;
+    @Specialization
+    public Object write(VirtualFrame frame, Object value) {
+        ensureObjectKind(frame);
+        setObject(getCargoFrame(frame), value);
+        return value;
     }
 }

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

@@ -99,9 +99,9 @@ protected Frame getGeneratorFrame(VirtualFrame frame) {
         }
 
         @Specialization(guards = "isBooleanKind(getGeneratorFrame(frame))")
-        public boolean write(VirtualFrame frame, boolean right) {
-            getGeneratorFrame(frame).setBoolean(frameSlot, right);
-            return right;
+        public boolean write(VirtualFrame frame, boolean value) {
+            getGeneratorFrame(frame).setBoolean(frameSlot, value);
+            return value;
         }
 
         @Specialization(guards = "isIntegerKind(getGeneratorFrame(frame))")
@@ -117,23 +117,25 @@ public long writeSmallPIntAsLong(VirtualFrame frame, PInt value) {
             return longValue;
         }
 
-        @Specialization(guards = {"isPrimitiveInt(value)", "!value.isNative()", "isOrSetObjectKind(getGeneratorFrame(frame))"}, rewriteOn = ArithmeticException.class)
+        @Specialization(guards = {"isPrimitiveInt(value)", "!value.isNative()"}, rewriteOn = ArithmeticException.class)
         public long writeSmallPIntAsObject(VirtualFrame frame, PInt value) {
+            ensureObjectKind(frame);
             long longValue = value.longValueExact();
             getGeneratorFrame(frame).setObject(frameSlot, longValue);
             return longValue;
         }
 
         @Specialization(guards = "isDoubleKind(getGeneratorFrame(frame))")
-        public double write(VirtualFrame frame, double right) {
-            getGeneratorFrame(frame).setDouble(frameSlot, right);
-            return right;
+        public double write(VirtualFrame frame, double value) {
+            getGeneratorFrame(frame).setDouble(frameSlot, value);
+            return value;
         }
 
-        @Specialization(guards = "isOrSetObjectKind(getGeneratorFrame(frame))")
-        public Object write(VirtualFrame frame, Object right) {
-            getGeneratorFrame(frame).setObject(frameSlot, right);
-            return right;
+        @Specialization
+        public Object write(VirtualFrame frame, Object value) {
+            ensureObjectKind(frame);
+            getGeneratorFrame(frame).setObject(frameSlot, value);
+            return value;
         }
     }