[GR-31295] IndexNodes do not support long length.

PullRequest: graalpython/1799

Author: ppisl

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/IndexNodes.java

@@ -88,6 +88,10 @@ public int execute(boolean index, int length) {
             return subNode.execute(index, length, errorMessage);
         }
 
+        public long executeLong(long index, long length) {
+            return subNode.executeLong(index, length, errorMessage);
+        }
+
         protected final String getErrorMessage() {
             return errorMessage;
         }
@@ -154,6 +158,8 @@ public abstract static class NormalizeIndexCustomMessageNode extends Node {
 
         public abstract int execute(int index, int length, String errorMessage);
 
+        public abstract long executeLong(long index, long length, String errorMessage);
+
         public static NormalizeIndexCustomMessageNode create() {
             return NormalizeIndexWithBoundsCheckNodeGen.create();
         }
@@ -234,6 +240,18 @@ int doPIntOvf(PInt index, int length, String errorMessage,
             }
         }
 
+        @Specialization
+        static long doLongLong(long lIndex, long length, String errorMessage,
+                        @Shared("negativeIndexProfile") @Cached ConditionProfile negativeIndexProfile,
+                        @Shared("boundsCheckNode") @Cached BoundsCheckNode boundsCheckNode) {
+            long normalizedIndex = lIndex;
+            if (negativeIndexProfile.profile(normalizedIndex < 0)) {
+                normalizedIndex += length;
+            }
+            boundsCheckNode.execute(errorMessage, normalizedIndex, length);
+            return normalizedIndex;
+        }
+
     }
 
     @GenerateUncached
@@ -289,17 +307,38 @@ static int doPIntOvf(PInt index, int length, String errorMessage,
                 throw raiseNode.raiseNumberTooLarge(PythonBuiltinClassType.IndexError, index);
             }
         }
+
+        @Specialization
+        static long doLongLong(long index, long length, @SuppressWarnings("unused") String errorMessage,
+                        @Shared("negativeIndexProfile") @Cached ConditionProfile negativeIndexProfile) {
+            long idx = index;
+            if (negativeIndexProfile.profile(idx < 0)) {
+                idx += length;
+            }
+            return idx;
+        }
     }
 
     @GenerateUncached
     public abstract static class BoundsCheckNode extends Node {
 
         public abstract void execute(String errorMessage, int idx, int length);
 
+        public abstract void execute(String errorMessage, long idx, long length);
+
         @Specialization
         static void doBoundsCheck(String errorMessage, int idx, int length,
                         @Cached ConditionProfile outOfBoundsProfile,
-                        @Cached PRaiseNode raiseNode) {
+                        @Shared("raiseNode") @Cached PRaiseNode raiseNode) {
+            if (outOfBoundsProfile.profile(idx < 0 || idx >= length)) {
+                throw raiseNode.raise(PythonBuiltinClassType.IndexError, errorMessage);
+            }
+        }
+
+        @Specialization
+        static void doBoundsCheck(String errorMessage, long idx, long length,
+                        @Cached ConditionProfile outOfBoundsProfile,
+                        @Shared("raiseNode") @Cached PRaiseNode raiseNode) {
             if (outOfBoundsProfile.profile(idx < 0 || idx >= length)) {
                 throw raiseNode.raise(PythonBuiltinClassType.IndexError, errorMessage);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/AccessForeignItemNodes.java

@@ -151,9 +151,9 @@ Object doArraySlice(Object object, PSlice idxSlice,
         Object doArrayIndex(Object object, Object key,
                         @Cached NormalizeIndexNode normalize,
                         @Shared("lib") @CachedLibrary(limit = "getCallSiteInlineCacheMaxDepth()") InteropLibrary lib) {
-            if (lib.isNumber(key) && lib.fitsInInt(key)) {
+            if (lib.isNumber(key) && lib.fitsInLong(key)) {
                 try {
-                    return readForeignIndex(object, normalize.execute(lib.asInt(key), (int) lib.getArraySize(object)), lib);
+                    return readForeignIndex(object, normalize.executeLong(lib.asLong(key), lib.getArraySize(object)), lib);
                 } catch (UnsupportedMessageException e) {
                     throw CompilerDirectives.shouldNotReachHere(e);
                 }