Allow different error types when casting to index-sized int.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -252,7 +252,7 @@ protected boolean isInt(Object o) {
         protected CastToIndexNode getCastToIndexNode() {
             if (castToIndexNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                castToIndexNode = insert(CastToIndexNode.create());
+                castToIndexNode = insert(CastToIndexNode.createOverflow());
             }
             return castToIndexNode;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/CastToIndexNode.java

@@ -41,12 +41,14 @@
 package com.oracle.graal.python.nodes.util;
 
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INDEX__;
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.IndexError;
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.nodes.PBaseNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
-import com.oracle.graal.python.runtime.exception.PException;
+import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -58,8 +60,16 @@
  */
 public abstract class CastToIndexNode extends PBaseNode {
 
+    private static final String ERROR_MESSAGE = "cannot fit 'int' into an index-sized integer";
+
     @Child private LookupAndCallUnaryNode callIndexNode;
+
     private final BranchProfile errorProfile = BranchProfile.create();
+    private final PythonErrorType errorType;
+
+    public CastToIndexNode(PythonErrorType errorType) {
+        this.errorType = errorType;
+    }
 
     public abstract int execute(Object x);
 
@@ -89,7 +99,7 @@ int doLongOvf(long x) {
         try {
             return PInt.intValueExact(x);
         } catch (ArithmeticException e) {
-            throw raiseIndexError();
+            throw raise(errorType, ERROR_MESSAGE);
         }
     }
 
@@ -103,7 +113,7 @@ int doPIntOvf(PInt x) {
         try {
             return x.intValueExact();
         } catch (ArithmeticException e) {
-            throw raiseIndexError();
+            throw raise(errorType, ERROR_MESSAGE);
         }
     }
 
@@ -122,6 +132,10 @@ int doGeneric(Object x) {
     }
 
     public static CastToIndexNode create() {
-        return CastToIndexNodeGen.create();
+        return CastToIndexNodeGen.create(IndexError);
+    }
+
+    public static CastToIndexNode createOverflow() {
+        return CastToIndexNodeGen.create(OverflowError);
     }
 }