Move set-slice implementation to a single location in a node.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/ByteArrayBuiltins.java

@@ -675,17 +675,11 @@ protected static GetItemNode createGetItem() {
     @GenerateNodeFactory
     @ImportStatic(SpecialMethodNames.class)
     abstract static class SetItemNode extends PythonTernaryBuiltinNode {
-        @Child private SequenceStorageNodes.NormalizeIndexNode normalize;
-
-        @Specialization
-        PNone doInt(PByteArray self, int idx, Object value) {
-            self.setItemNormalized(ensureNormalize().execute(idx, self.len()), value);
-            return PNone.NONE;
-        }
+        @Child private SequenceStorageNodes.SetItemNode setItemNode;
 
-        @Specialization
-        PNone doSliceSequence(PByteArray self, PSlice slice, PSequence value) {
-            self.setSlice(slice, value);
+        @Specialization(guards = "!isMemoryView(value)")
+        PNone doBasic(PByteArray self, Object idx, Object value) {
+            getSetItemNode().execute(self.getSequenceStorage(), idx, value);
             return PNone.NONE;
         }
 
@@ -695,62 +689,35 @@ PNone doSliceMemoryview(PByteArray self, PSlice slice, PMemoryView value,
                         @Cached("createBinaryProfile()") ConditionProfile isBytesProfile) {
             Object bytesObj = callToBytesNode.executeObject(value);
             if (isBytesProfile.profile(bytesObj instanceof PBytes)) {
-                doSliceSequence(self, slice, (PBytes) bytesObj);
+                doBasic(self, slice, bytesObj);
                 return PNone.NONE;
             }
             throw raise(SystemError, "could not get bytes of memoryview");
         }
 
-        @Specialization(guards = "isScalar(value)")
-        @SuppressWarnings("unused")
-        PNone doSliceScalar(PByteArray self, PSlice slice, Object value) {
-            throw raise(TypeError, "can assign only bytes, buffers, or iterables of ints in range(0, 256)");
-        }
-
-        @Specialization(rewriteOn = ArithmeticException.class)
-        public Object doLong(PByteArray primary, long idx, Object value) {
-            return doInt(primary, PInt.intValueExact(idx), value);
-        }
-
-        @Specialization(replaces = "doLong")
-        public Object doLongOvf(PByteArray primary, long idx, Object value) {
-            try {
-                return doInt(primary, PInt.intValueExact(idx), value);
-            } catch (ArithmeticException e) {
-                throw raiseIndexError();
-            }
-        }
-
-        @Specialization(rewriteOn = ArithmeticException.class)
-        public Object doPInt(PByteArray primary, PInt idx, Object value) {
-            return doInt(primary, idx.intValueExact(), value);
-        }
-
-        @Specialization(replaces = "doPInt")
-        public Object doPIntOvf(PByteArray primary, PInt idx, Object value) {
-            try {
-                return doInt(primary, idx.intValueExact(), value);
-            } catch (ArithmeticException e) {
-                throw raiseIndexError();
-            }
-        }
+        // TODO error message
+// @Specialization(guards = "isScalar(value)")
+// @SuppressWarnings("unused")
+// PNone doSliceScalar(PByteArray self, PSlice slice, Object value) {
+// throw raise(TypeError, "can assign only bytes, buffers, or iterables of ints in range(0, 256)");
+// }
 
         @Fallback
         @SuppressWarnings("unused")
         Object doGeneric(Object self, Object idx, Object value) {
             return PNotImplemented.NOT_IMPLEMENTED;
         }
 
-        private SequenceStorageNodes.NormalizeIndexNode ensureNormalize() {
-            if (normalize == null) {
+        private SequenceStorageNodes.SetItemNode getSetItemNode() {
+            if (setItemNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                normalize = insert(SequenceStorageNodes.NormalizeIndexNode.forArrayAssign());
+                setItemNode = insert(SequenceStorageNodes.SetItemNode.create(NormalizeIndexNode.forBytearray()));
             }
-            return normalize;
+            return setItemNode;
         }
 
-        protected boolean isScalar(Object value) {
-            return !(value instanceof PSequence || value instanceof PMemoryView);
+        protected static boolean isMemoryView(Object value) {
+            return value instanceof PMemoryView;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java

@@ -38,9 +38,9 @@
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.EmptySequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage;
-import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage.ElementType;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStoreException;
+import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage.ListStorageType;
 import com.oracle.truffle.api.CompilerAsserts;
 
 public final class PByteArray extends PSequence implements PIBytesLike {
@@ -101,7 +101,7 @@ public SequenceStorage getSequenceStorage() {
 
     @Override
     public final void setSequenceStorage(SequenceStorage store) {
-        assert store instanceof ByteSequenceStorage || store instanceof NativeSequenceStorage && ((NativeSequenceStorage) store).getElementType() == ElementType.BYTE;
+        assert store instanceof ByteSequenceStorage || store instanceof NativeSequenceStorage && ((NativeSequenceStorage) store).getElementType() == ListStorageType.Byte;
         this.store = store;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PBytes.java

@@ -33,8 +33,8 @@
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage;
-import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage.ElementType;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
+import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage.ListStorageType;
 import com.oracle.truffle.api.CompilerAsserts;
 
 public final class PBytes extends PImmutableSequence implements PIBytesLike {
@@ -58,7 +58,7 @@ public SequenceStorage getSequenceStorage() {
 
     @Override
     public void setSequenceStorage(SequenceStorage store) {
-        assert store instanceof ByteSequenceStorage || store instanceof NativeSequenceStorage && ((NativeSequenceStorage) store).getElementType() == ElementType.BYTE;
+        assert store instanceof ByteSequenceStorage || store instanceof NativeSequenceStorage && ((NativeSequenceStorage) store).getElementType() == ListStorageType.Byte;
         this.store = store;
     }