refactor: remove generilize form ArrayBasedSequenceStorage

Author: horakivo

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

@@ -3223,7 +3223,7 @@ static Object[] doBool(BoolSequenceStorage storage) {
 
         @Specialization
         static Object[] doMro(MroSequenceStorage storage) {
-            return storage.getCopyOfInternalArray();
+            throw CompilerDirectives.shouldNotReachHere();
         }
 
         @Specialization
@@ -3611,7 +3611,12 @@ static Object[] doObjectSequenceStorage(ObjectSequenceStorage s) {
             return s.getInternalArray();
         }
 
-        @Specialization(guards = "!isObjectStorage(s)")
+        @Specialization
+        static Object[] doMroSequenceStorage(MroSequenceStorage s) {
+            return s.getInternalArray();
+        }
+
+        @Specialization(guards = "!isObjectStorage(s) || isMroStorage(s)")
         static Object[] doArrayBasedSequenceStorage(Node inliningTarget, ArrayBasedSequenceStorage s,
                         @Cached CopyInternalArrayNode copy) {
             Object[] internalArray = copy.execute(inliningTarget, s);
@@ -3647,6 +3652,10 @@ private static Object[] materializeGeneric(Node inliningTarget, SequenceStorage
         protected static boolean isObjectStorage(ArrayBasedSequenceStorage storage) {
             return storage instanceof ObjectSequenceStorage;
         }
+
+        protected static boolean isMroStorage(ArrayBasedSequenceStorage storage) {
+            return storage instanceof MroSequenceStorage;
+        }
     }
 
     @GenerateUncached
@@ -3682,9 +3691,8 @@ static boolean isObjectSequenceStorage(SequenceStorage s) {
 
     }
 
-    @GenerateCached
     @GenerateUncached
-    @GenerateInline(inlineByDefault = true)
+    @GenerateInline
     public abstract static class InsertItemArrayBasedStorageNode extends Node {
 
         public static SequenceStorage executeUncached(ArrayBasedSequenceStorage storage, int index, Object value) {
@@ -3693,10 +3701,6 @@ public static SequenceStorage executeUncached(ArrayBasedSequenceStorage storage,
 
         protected abstract SequenceStorage execute(Node inliningTarget, ArrayBasedSequenceStorage storage, int index, Object value);
 
-        public final SequenceStorage executeCached(ArrayBasedSequenceStorage storage, int index, Object value) {
-            return execute(this, storage, index, value);
-        }
-
         @Specialization
         static SequenceStorage doIntStorage(IntSequenceStorage storage, int idx, int value) {
             storage.insertIntItem(idx, value);
@@ -3757,10 +3761,12 @@ static SequenceStorage doMroStorage(MroSequenceStorage storage, int idx, Object
         }
 
         @Fallback
-        static SequenceStorage doGeneralization(ArrayBasedSequenceStorage storage, int idx, Object value,
-                        @Cached(inline = false) InsertItemArrayBasedStorageNode recursiveNode) {
-            ObjectSequenceStorage newStorage = storage.generalize();
-            return recursiveNode.executeCached(newStorage, idx, value);
+        static SequenceStorage doGeneralization(Node inliningTarget, ArrayBasedSequenceStorage storage, int idx, Object value,
+                        @Cached GetInternalObjectArrayNode getInternalObjectArrayNode) {
+            Object[] values = getInternalObjectArrayNode.execute(inliningTarget, storage);
+            ObjectSequenceStorage newStorage = new ObjectSequenceStorage(values);
+            newStorage.insertItem(idx, value);
+            return newStorage;
         }
     }
 

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

@@ -51,9 +51,4 @@ public abstract class ArrayBasedSequenceStorage extends BasicSequenceStorage {
     public abstract void setInternalArrayObject(Object arrayObject);
 
     public abstract ArrayBasedSequenceStorage createEmpty(int newCapacity);
-
-    public ObjectSequenceStorage generalize() {
-        return new ObjectSequenceStorage(getInternalArray());
-    }
-
 }

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

@@ -33,10 +33,6 @@ public abstract class BasicSequenceStorage extends SequenceStorage {
 
     public abstract void setItemNormalized(int idx, Object value) throws SequenceStoreException;
 
-    /**
-     * Get internal array object without copying. Note: The length must be taken from the sequence
-     * storage object.
-     */
     public final void setNewLength(int length) {
         this.length = length;
     }

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

@@ -243,10 +243,6 @@ private static boolean invalidateAttributesInMROFinalAssumptions(List<Assumption
         return true;
     }
 
-    public Object[] getCopyOfInternalArray() {
-        return getInternalArray();
-    }
-
     public boolean hasAttributeInMROFinalAssumptions() {
         return hasAttributesInMROFinalAssumptions;
     }

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

@@ -118,11 +118,6 @@ public void ensureCapacity(int newCapacity) throws ArithmeticException {
         }
     }
 
-    @Override
-    public ObjectSequenceStorage generalize() {
-        throw CompilerDirectives.shouldNotReachHere();
-    }
-
     @Override
     public Object getIndicativeValue() {
         return null;