Push SequenceStorage.setItemNormalized down

Author: msimacek

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

@@ -3348,7 +3348,7 @@ protected static SequenceStorage doStorage(EmptySequenceStorage storage, int ind
         @Specialization(limit = "MAX_ARRAY_STORAGES", guards = {"storage.getClass() == cachedClass"})
         protected static SequenceStorage doStorage(BasicSequenceStorage storage, int index, Object value, boolean recursive,
                         @Shared @Cached(inline = false) InsertItemNode recursiveNode,
-                        @Cached("storage.getClass()") Class<? extends SequenceStorage> cachedClass) {
+                        @Cached("storage.getClass()") Class<? extends BasicSequenceStorage> cachedClass) {
             try {
                 cachedClass.cast(storage).insertItem(index, value);
                 return storage;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java

@@ -32,6 +32,10 @@ public abstract class BasicSequenceStorage extends SequenceStorage {
 
     public abstract Object getItemNormalized(int idx);
 
+    public abstract void setItemNormalized(int idx, Object value) throws SequenceStoreException;
+
+    public abstract void insertItem(int idx, Object value) throws SequenceStoreException;
+
     public abstract Object getCopyOfInternalArrayObject();
 
     public abstract void setInternalArrayObject(Object arrayObject);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/EmptySequenceStorage.java

@@ -92,18 +92,6 @@ public Object[] getCopyOfInternalArray() {
         return PythonUtils.EMPTY_OBJECT_ARRAY;
     }
 
-    @Override
-    public void setItemNormalized(int idx, Object value) throws SequenceStoreException {
-        CompilerDirectives.transferToInterpreter();
-        throw PRaiseNode.getUncached().raise(ValueError, ErrorMessages.LIST_ASSIGMENT_INDEX_OUT_OF_RANGE);
-    }
-
-    @Override
-    public void insertItem(int idx, Object value) throws SequenceStoreException {
-        assert idx == 0;
-        throw new SequenceStoreException(value);
-    }
-
     @Override
     public void copyItem(int idxTo, int idxFrom) {
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/NativeSequenceStorage.java

@@ -123,16 +123,6 @@ public final Object[] getCopyOfInternalArray() {
         throw CompilerDirectives.shouldNotReachHere();
     }
 
-    @Override
-    public final void setItemNormalized(int idx, Object value) throws SequenceStoreException {
-        throw CompilerDirectives.shouldNotReachHere();
-    }
-
-    @Override
-    public final void insertItem(int idx, Object value) throws SequenceStoreException {
-        throw CompilerDirectives.shouldNotReachHere();
-    }
-
     @Override
     public final SequenceStorage getSliceInBound(int start, int stop, int step, int len) {
         throw CompilerDirectives.shouldNotReachHere();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java

@@ -91,10 +91,6 @@ public final int getCapacity() {
 
     public abstract Object[] getCopyOfInternalArray();
 
-    public abstract void setItemNormalized(int idx, Object value) throws SequenceStoreException;
-
-    public abstract void insertItem(int idx, Object value) throws SequenceStoreException;
-
     public abstract SequenceStorage getSliceInBound(int start, int stop, int step, int len);
 
     public abstract void reverse();