Remove some usages of 'PTuple.getArray'.

Author: fangerer

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

@@ -78,6 +78,8 @@
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.NormalizeIndexNode;
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
@@ -326,27 +328,14 @@ abstract static class AsDouble extends PythonBuiltinNode {
     @GenerateNodeFactory
     abstract static class PyTuple_SetItem extends NativeBuiltin {
         @Specialization
-        int doI(PTuple tuple, int position, Object element) {
-            Object[] store = tuple.getArray();
-            if (position < 0 || position >= store.length) {
-                return raiseNative(-1, PythonErrorType.IndexError, "tuple assignment index out of range");
-            }
-            store[position] = element;
+        int doI(PTuple tuple, Object position, Object element,
+                        @Cached("create()") SequenceStorageNodes.SetItemNode setItemNode) {
+            setItemNode.execute(tuple.getSequenceStorage(), position, element);
             return 0;
         }
 
-        @Specialization(rewriteOn = ArithmeticException.class)
-        int doL(PTuple tuple, long position, Object element) {
-            return doI(tuple, PInt.intValueExact(position), element);
-        }
-
-        @Specialization
-        int doLOvf(PTuple tuple, long position, Object element) {
-            try {
-                return doI(tuple, PInt.intValueExact(position), element);
-            } catch (ArithmeticException e) {
-                return raiseNative(-1, PythonErrorType.IndexError, "cannot fit 'int' into an index-sized integer");
-            }
+        protected static SequenceStorageNodes.SetItemNode createSetItem() {
+            return SequenceStorageNodes.SetItemNode.create(NormalizeIndexNode.forTupleAssign());
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapperMR.java

@@ -236,30 +236,9 @@ abstract static class WriteArrayItemNode extends Node {
         public abstract Object execute(Object arrayObject, Object idx, Object value);
 
         @Specialization
-        Object doTuple(PTuple tuple, long idx, Object value) {
-            Object[] store = tuple.getArray();
-            // TODO(fa) do proper index conversion
-            store[(int) idx] = getToJavaNode().execute(value);
-            return value;
-        }
-
-        @Specialization
-        Object doList(PList list, long idx, Object value,
-                        @Cached("createListSetItem()") ListBuiltins.SetItemNode setItemNode) {
-            return setItemNode.execute(list, idx, getToJavaNode().execute(value));
-        }
-
-        @Specialization
-        Object doBytes(PBytes tuple, long idx, byte value,
-                        @Cached("create()") SequenceStorageNodes.SetItemNode setItemNode) {
-            setItemNode.executeLong(tuple.getSequenceStorage(), idx, value);
-            return value;
-        }
-
-        @Specialization
-        Object doByteArray(PByteArray tuple, long idx, byte value,
+        Object doTuple(PSequence s, long idx, Object value,
                         @Cached("create()") SequenceStorageNodes.SetItemNode setItemNode) {
-            setItemNode.executeLong(tuple.getSequenceStorage(), idx, value);
+            setItemNode.execute(s.getSequenceStorage(), idx, getToJavaNode().execute(value));
             return value;
         }
 

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

@@ -471,9 +471,9 @@ public SetItemNode(NormalizeIndexNode normalizeIndexNode) {
 
         public abstract void execute(SequenceStorage s, Object key, Object value);
 
-        public abstract void executeInt(SequenceStorage s, int key, Object value);
+        public abstract void execute(SequenceStorage s, int key, Object value);
 
-        public abstract void executeLong(SequenceStorage s, long key, Object value);
+        public abstract void execute(SequenceStorage s, long key, Object value);
 
         @Specialization
         protected void doScalarInt(SequenceStorage storage, int idx, Object value) {
@@ -1221,6 +1221,7 @@ public abstract static class NormalizeIndexNode extends PBaseNode {
         public static final String INDEX_OUT_OF_BOUNDS = "index out of range";
         public static final String RANGE_OUT_OF_BOUNDS = "range index out of range";
         public static final String TUPLE_OUT_OF_BOUNDS = "tuple index out of range";
+        public static final String TUPLE_ASSIGN_OUT_OF_BOUNDS = "tuple assignment index out of range";
         public static final String LIST_OUT_OF_BOUNDS = "list index out of range";
         public static final String LIST_ASSIGN_OUT_OF_BOUNDS = "list assignment index out of range";
         public static final String ARRAY_OUT_OF_BOUNDS = "array index out of range";
@@ -1327,6 +1328,10 @@ public static NormalizeIndexNode forTuple() {
             return create(TUPLE_OUT_OF_BOUNDS);
         }
 
+        public static NormalizeIndexNode forTupleAssign() {
+            return create(TUPLE_ASSIGN_OUT_OF_BOUNDS);
+        }
+
         public static NormalizeIndexNode forArray() {
             return create(ARRAY_OUT_OF_BOUNDS);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/CastToListNode.java

@@ -85,7 +85,7 @@ protected PythonClass getClass(Object value) {
     public Object[] getArray(VirtualFrame frame) {
         Object result = execute(frame);
         if (result instanceof PTuple) {
-            return ((PTuple) result).getArray();
+            return ((PTuple) result).getSequenceStorage().getInternalArray();
         } else if (result instanceof PList) {
             return ((PList) result).getSequenceStorage().getInternalArray();
         } else {