refactor: remove getCopyOfInternalArray from ArrayBasedSequenceStorage

Author: horakivo

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

@@ -3191,10 +3191,39 @@ public static Object[] executeUncached(SequenceStorage s) {
             return SequenceStorageNodesFactory.CopyInternalArrayNodeGen.getUncached().execute(null, s);
         }
 
-        @Specialization(limit = "MAX_BASIC_STORAGES", guards = "s.getClass() == cachedClass")
-        static Object[] doArrayBased(ArrayBasedSequenceStorage s,
-                        @Cached("s.getClass()") Class<? extends ArrayBasedSequenceStorage> cachedClass) {
-            return cachedClass.cast(s).getCopyOfInternalArray();
+        @Specialization
+        static Object[] doInt(IntSequenceStorage storage) {
+            return storage.getCopyOfInternalArray();
+        }
+
+        @Specialization
+        static Object[] doDouble(DoubleSequenceStorage storage) {
+            return storage.getCopyOfInternalArray();
+        }
+
+        @Specialization
+        static Object[] doByte(ByteSequenceStorage storage) {
+            return storage.getCopyOfInternalArray();
+        }
+
+        @Specialization
+        static Object[] doLong(LongSequenceStorage storage) {
+            return storage.getCopyOfInternalArray();
+        }
+
+        @Specialization
+        static Object[] doObject(ObjectSequenceStorage storage) {
+            return storage.getCopyOfInternalArray();
+        }
+
+        @Specialization
+        static Object[] doBool(BoolSequenceStorage storage) {
+            return storage.getCopyOfInternalArray();
+        }
+
+        @Specialization
+        static Object[] doMro(MroSequenceStorage storage) {
+            return storage.getCopyOfInternalArray();
         }
 
         @Specialization
@@ -3582,7 +3611,7 @@ static Object[] doObjectSequenceStorage(ObjectSequenceStorage s) {
             return s.getInternalArray();
         }
 
-        @Specialization
+        @Specialization(guards = "!isObjectStorage(s)")
         static Object[] doArrayBasedSequenceStorage(Node inliningTarget, ArrayBasedSequenceStorage s,
                         @Cached CopyInternalArrayNode copy) {
             Object[] internalArray = copy.execute(inliningTarget, s);
@@ -3614,6 +3643,10 @@ private static Object[] materializeGeneric(Node inliningTarget, SequenceStorage
             }
             return barr;
         }
+
+        protected static boolean isObjectStorage(ArrayBasedSequenceStorage storage) {
+            return storage instanceof ObjectSequenceStorage;
+        }
     }
 
     @GenerateUncached

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

@@ -44,8 +44,6 @@ public abstract class ArrayBasedSequenceStorage extends BasicSequenceStorage {
 
     public abstract Object[] getInternalArray();
 
-    public abstract Object[] getCopyOfInternalArray();
-
     public abstract Object getInternalArrayObject();
 
     public abstract Object getCopyOfInternalArrayObject();

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

@@ -150,7 +150,6 @@ public Object getCopyOfInternalArrayObject() {
         return Arrays.copyOf(values, length);
     }
 
-    @Override
     public Object[] getCopyOfInternalArray() {
         return getInternalArray();
     }

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

@@ -177,7 +177,6 @@ public Object getCopyOfInternalArrayObject() {
         return Arrays.copyOf(values, length);
     }
 
-    @Override
     public Object[] getCopyOfInternalArray() {
         return getInternalArray();
     }

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

@@ -162,7 +162,6 @@ public Object getCopyOfInternalArrayObject() {
         return Arrays.copyOf(values, length);
     }
 
-    @Override
     public Object[] getCopyOfInternalArray() {
         return getInternalArray();
     }

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

@@ -162,7 +162,6 @@ public Object getCopyOfInternalArrayObject() {
         return Arrays.copyOf(values, length);
     }
 
-    @Override
     public Object[] getCopyOfInternalArray() {
         return getInternalArray();
     }

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

@@ -165,7 +165,6 @@ public Object getCopyOfInternalArrayObject() {
         return Arrays.copyOf(values, length);
     }
 
-    @Override
     public Object[] getCopyOfInternalArray() {
         return getInternalArray();
     }

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

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

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

@@ -91,7 +91,6 @@ public Object[] getInternalArray() {
         return values;
     }
 
-    @Override
     public Object[] getCopyOfInternalArray() {
         return PythonUtils.arrayCopyOf(values, length);
     }