sequence accesses should raise IndexError on overflow

timfel · timfel · commit 65240fd29216 · 2019-12-20T15:00:52.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -477,7 +477,7 @@ private PythonObjectLibrary getLibrary() {
         }
 
         protected final int normalizeIndex(VirtualFrame frame, Object idx, SequenceStorage store) {
-            int intIdx = getLibrary().asSizeWithState(idx, PArguments.getThreadState(frame));
+            int intIdx = getLibrary().asSizeWithState(idx, PythonBuiltinClassType.IndexError, PArguments.getThreadState(frame));
             if (normalizeIndexNode != null) {
                 return normalizeIndexNode.execute(intIdx, getStoreProfile().profile(store).length());
             }
@@ -492,7 +492,7 @@ protected final int normalizeIndex(@SuppressWarnings("unused") VirtualFrame fram
         }
 
         protected final int normalizeIndex(@SuppressWarnings("unused") VirtualFrame frame, long idx, SequenceStorage store) {
-            int intIdx = getLibrary().asSize(idx);
+            int intIdx = getLibrary().asSize(idx, PythonBuiltinClassType.IndexError);
             if (normalizeIndexNode != null) {
                 return normalizeIndexNode.execute(intIdx, getStoreProfile().profile(store).length());
             }

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ private PythonObjectLibrary getLibrary() {`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`protected final int normalizeIndex(VirtualFrame frame, Object idx, SequenceStorage store) {`
`480`		`- int intIdx = getLibrary().asSizeWithState(idx, PArguments.getThreadState(frame));`
	`480`	`+ int intIdx = getLibrary().asSizeWithState(idx, PythonBuiltinClassType.IndexError, PArguments.getThreadState(frame));`
`481`	`481`	`if (normalizeIndexNode != null) {`
`482`	`482`	`return normalizeIndexNode.execute(intIdx, getStoreProfile().profile(store).length());`
`483`	`483`	`}`
`@@ -492,7 +492,7 @@ protected final int normalizeIndex(@SuppressWarnings("unused") VirtualFrame fram`
`492`	`492`	`}`
`493`	`493`
`494`	`494`	`protected final int normalizeIndex(@SuppressWarnings("unused") VirtualFrame frame, long idx, SequenceStorage store) {`
`495`		`- int intIdx = getLibrary().asSize(idx);`
	`495`	`+ int intIdx = getLibrary().asSize(idx, PythonBuiltinClassType.IndexError);`
`496`	`496`	`if (normalizeIndexNode != null) {`
`497`	`497`	`return normalizeIndexNode.execute(intIdx, getStoreProfile().profile(store).length());`
`498`	`498`	`}`