update and fix SliceLiteralNode

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_slice.py

@@ -178,3 +178,19 @@ def test_range_step2():
     assert t[100:-100:-1] == range(13, 3, -2)
     assert t[-100:100:-1] == range(3, 13, -2)
     assert t[-100:100:2] == range(5, 15, 4)
+
+
+def test_correct_error():
+    class X():
+        def __index__(self):
+            return "42"
+
+    try:
+        [1][:X()]
+    except TypeError as e:
+        assert "__index__ returned non-int" in str(e)
+
+    try:
+        [1][:"42"]
+    except TypeError as e:
+        assert "slice indices must be integers" in str(e)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/SliceLiteralNode.java

@@ -40,12 +40,13 @@
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.subscript.SliceLiteralNodeGen.CastToSliceComponentNodeGen;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
-import com.oracle.graal.python.nodes.util.CastToIndexNode;
+import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
@@ -118,6 +119,7 @@ public static SliceLiteralNode create() {
         return SliceLiteralNodeGen.create(null, null, null);
     }
 
+    @ImportStatic(PythonOptions.class)
     abstract static class CastToSliceComponentNode extends PNodeWithContext {
 
         @Child private PRaiseNode raiseNode;
@@ -174,28 +176,19 @@ int doPInt(PInt i) {
 
         @Specialization(replaces = {"doBoolean", "doInt", "doLong", "doPInt"}, limit = "getCallSiteInlineCacheMaxDepth()")
         int doGeneric(VirtualFrame frame, Object i,
+                        @Cached PRaiseNode raise,
                         @CachedLibrary("i") PythonObjectLibrary lib,
                         @Cached IsBuiltinClassProfile errorProfile) {
-            try {
-                return lib.asIndexWithState(i, PArguments.getThreadState(frame));
-            } catch (PException e) {
-                e.expect(PythonBuiltinClassType.OverflowError, errorProfile);
-                return overflowValue;
-            }
-        }
-
-        protected CastToIndexNode createCastToIndex() {
-            return CastToIndexNode.create(PythonBuiltinClassType.OverflowError, val -> {
-                throw getRaiseNode().raise(PythonBuiltinClassType.TypeError, "slice indices must be integers or None or have an __index__ method");
-            });
-        }
-
-        private PRaiseNode getRaiseNode() {
-            if (raiseNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                raiseNode = insert(PRaiseNode.create());
+            if (lib.canBeIndex(i)) {
+                try {
+                    return lib.asIndexWithState(i, PArguments.getThreadState(frame));
+                } catch (PException e) {
+                    e.expect(PythonBuiltinClassType.OverflowError, errorProfile);
+                    return overflowValue;
+                }
+            } else {
+                throw raise.raise(PythonBuiltinClassType.TypeError, "slice indices must be integers or None or have an __index__ method");
             }
-            return raiseNode;
         }
 
         public static CastToSliceComponentNode create(int defaultValue, int overflowValue) {