Clean up

Author: qunaibit

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/RangeBuiltins.java

@@ -237,7 +237,7 @@ private boolean eqInt(PIntRange range, int len, int start, int step) {
                             len, start, step);
         }
 
-        private boolean eqInt(int llen, int lstart, int lstep, int rlen, int rstart, int rstep) {
+        private static boolean eqInt(int llen, int lstart, int lstep, int rlen, int rstart, int rstep) {
             if (llen != rlen) {
                 return false;
             }
@@ -276,10 +276,6 @@ protected boolean canBeIntRange(PBigRange range, PythonObjectLibrary pol) {
             return pol.canBeIndex(range.getPIntLength()) && pol.canBeIndex(range.getPIntStart()) && pol.canBeIndex(range.getPIntStep());
         }
 
-        protected boolean canBeIntRange(Object len, Object start, Object step, PythonObjectLibrary pol) {
-            return pol.canBeIndex(len) && pol.canBeIndex(start) && pol.canBeIndex(step);
-        }
-
         @Specialization
         boolean eqIntInt(PIntRange left, PIntRange right) {
             if (left == right) {
@@ -348,16 +344,15 @@ Object doPRangeObj(PRange range, @SuppressWarnings("unused") PObjectSlice slice)
             return range;
         }
 
-        @Specialization(guards = "canBeNumber(idx)")
+        @Specialization(guards = "canBeInteger(idx)")
         Object doPRange(PIntRange primary, Object idx) {
             return primary.getIntItemNormalized(normalize.execute(idx, primary.getIntLength()));
         }
 
-        @Specialization(guards = "canBeNumber(idx)")
+        @Specialization(guards = "canBeInteger(idx)")
         Object doPRange(PBigRange self, Object idx,
                         @Cached CastToJavaBigIntegerNode toBigInt) {
-            BigInteger i = computeBigRangeItem(self, idx, toBigInt);
-            return factory().createInt(self.getBigIntItemNormalized(i));
+            return factory().createInt(self.getBigIntItemNormalized(computeBigRangeItem(self, idx, toBigInt)));
         }
 
         @TruffleBoundary
@@ -411,9 +406,7 @@ Object doPRangeObjWithSlowPath(PIntRange range, PSlice slice,
                 SliceInfo info = compute.execute(slice, range.getIntLength());
                 return createRange(info, rStart, rStep, lenOfRangeNode);
             } catch (PException pe) {
-                if (!profileError.profileException(pe, PythonBuiltinClassType.OverflowError)) {
-                    throw pe;
-                }
+                pe.expect(PythonBuiltinClassType.OverflowError, profileError);
                 // pass
             } catch (CannotCastException | ArithmeticException e) {
                 // pass
@@ -440,9 +433,7 @@ Object doPRangePSliceSlowPath(PBigRange range, PSlice slice,
                 SliceInfo info = compute.execute(slice, lib.asSize(range.getLength()));
                 return createRange(info, rStart, rStep, lenOfRangeNode);
             } catch (PException pe) {
-                if (!profileError.profileException(pe, PythonBuiltinClassType.OverflowError)) {
-                    throw pe;
-                }
+                pe.expect(PythonBuiltinClassType.OverflowError, profileError);
                 // pass
             } catch (CannotCastException | ArithmeticException e) {
                 // pass
@@ -610,7 +601,7 @@ boolean containsSlowNum(PBigRange self, PInt other,
             return containsBigInt(self, other.getValue());
         }
 
-        @Specialization(guards = "!canBeNumber(elem) || !isBuiltinPInt(elem, isBuiltin)")
+        @Specialization(guards = "!canBeInteger(elem) || !isBuiltinPInt(elem, isBuiltin)")
         boolean containsIterator(VirtualFrame frame, PRange self, Object elem,
                         @Cached("createBinaryProfile()") ConditionProfile hasFrame,
                         @Cached GetIteratorExpressionNode.GetIteratorNode getIterator,
@@ -685,7 +676,7 @@ int doFastRange(VirtualFrame frame, PIntRange self, int elem,
             throw raise(ValueError, ErrorMessages.D_IS_NOT_IN_RANGE, elem);
         }
 
-        @Specialization(guards = "canBeNumber(elem)", limit = "getCallSiteInlineCacheMaxDepth()")
+        @Specialization(guards = "canBeInteger(elem)", limit = "getCallSiteInlineCacheMaxDepth()")
         Object doFastRangeGeneric(VirtualFrame frame, PIntRange self, Object elem,
                         @Cached ContainsNode containsNode,
                         @Cached("createBinaryProfile()") ConditionProfile hasFrame,
@@ -705,7 +696,7 @@ Object doFastRangeGeneric(VirtualFrame frame, PIntRange self, Object elem,
             throw raise(ValueError, ErrorMessages.IS_NOT_IN_RANGE, elem);
         }
 
-        @Specialization(guards = "canBeNumber(elem)")
+        @Specialization(guards = "canBeInteger(elem)")
         Object doLongRange(VirtualFrame frame, PBigRange self, Object elem,
                         @Cached ContainsNode containsNode,
                         @Cached CastToJavaBigIntegerNode castToBigInt) {
@@ -729,7 +720,7 @@ static boolean maySideEffect(PythonObject o, LookupInheritedAttributeNode.Dynami
          * XXX: (mq) currently sys.maxsize in {@link SysModuleBuiltins#MAXSIZE} is
          * {@link Integer#MAX_VALUE}.
          */
-        @Specialization(guards = "!canBeNumber(elem)")
+        @Specialization(guards = "!canBeInteger(elem)")
         Object containsIterator(VirtualFrame frame, PIntRange self, Object elem,
                         @Cached("createBinaryProfile()") ConditionProfile hasFrame,
                         @Cached GetIteratorExpressionNode.GetIteratorNode getIterator,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/RangeNodes.java

@@ -70,6 +70,7 @@ public abstract class RangeNodes {
     public abstract static class CreateBigRangeNode extends Node {
         public abstract PBigRange execute(Object start, Object stop, Object step, PythonObjectFactory factory);
 
+        @TruffleBoundary
         private static void checkStepZero(BigInteger stepBI, PRaiseNode raise) {
             if (stepBI.compareTo(BigInteger.ZERO) == 0) {
                 throw raise.raise(ValueError, ARG_MUST_NOT_BE_ZERO, "range()", 3);
@@ -197,7 +198,7 @@ PBigRange doIntRange(PIntRange range, PythonObjectFactory factory,
         }
 
         @Specialization
-        PBigRange doBigRange(PBigRange range, PythonObjectFactory factory) {
+        PBigRange doBigRange(PBigRange range, @SuppressWarnings("unused") PythonObjectFactory factory) {
             return range;
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PGuards.java

@@ -353,7 +353,7 @@ public static boolean isAnyPythonObject(Object obj) {
         return obj instanceof PythonAbstractObject;
     }
 
-    public static boolean canBeNumber(Object idx) {
+    public static boolean canBeInteger(Object idx) {
         return isBoolean(idx) || isInteger(idx) || isPInt(idx);
     }