refactor: removed getInternalArray from ArrayBasedSequenceStorage

Author: horakivo

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/nodes/storage/GetItemSliceNodeTests.java

@@ -161,7 +161,7 @@ public Object execute(VirtualFrame frame) {
         assertEquals(ObjectSequenceStorage.class, storage.getClass());
         var objectStorage = (ObjectSequenceStorage) storage;
         for (int i = 0; i < 3; i++) {
-            assertEquals(i + 2, objectStorage.getInternalArray()[i]);
+            assertEquals(i + 2, objectStorage.getInternalObjectArray()[i]);
         }
     }
 

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/nodes/storage/InsertItemNodeTest.java

@@ -75,7 +75,7 @@ public Object execute(VirtualFrame frame) {
         }.getCallTarget().call();
 
         assertEquals(ObjectSequenceStorage.class, storage.getClass());
-        var objectStorage = ((ObjectSequenceStorage) storage).getInternalArray();
+        var objectStorage = ((ObjectSequenceStorage) storage).getInternalObjectArray();
         assertEquals(5, objectStorage[0]);
         assertEquals(6, objectStorage[1]);
         assertEquals(11, objectStorage[2]);

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

@@ -394,7 +394,7 @@ public abstract static class StatResultNode extends PythonTernaryBuiltinNode {
         public static PTuple generic(VirtualFrame frame, Object cls, Object sequence, Object dict,
                         @Cached("create(STAT_RESULT_DESC)") StructSequence.NewNode newNode) {
             PTuple p = (PTuple) newNode.execute(frame, cls, sequence, dict);
-            Object[] data = CompilerDirectives.castExact(p.getSequenceStorage(), ObjectSequenceStorage.class).getInternalArray();
+            Object[] data = CompilerDirectives.castExact(p.getSequenceStorage(), ObjectSequenceStorage.class).getInternalObjectArray();
             for (int i = 7; i <= 9; i++) {
                 if (data[i + 3] == PNone.NONE) {
                     data[i + 3] = data[i];

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

@@ -677,7 +677,7 @@ protected static SequenceStorage doByteSequenceStorage(ByteSequenceStorage stora
         @Specialization
         protected static SequenceStorage doObjectSequenceStorage(ObjectSequenceStorage storage, int start, int stop, int step, int length) {
             Object[] newArray = new Object[length];
-            Object[] values = storage.getInternalArray();
+            Object[] values = storage.getInternalObjectArray();
 
             if (step == 1) {
                 PythonUtils.arraycopy(values, start, newArray, 0, length);
@@ -3150,7 +3150,7 @@ static SequenceStorage doBoolean(BoolSequenceStorage storage) {
 
         @Specialization
         static SequenceStorage doObject(ObjectSequenceStorage storage) {
-            return new ObjectSequenceStorage(PythonUtils.arrayCopyOf(storage.getInternalArray(), storage.length()));
+            return new ObjectSequenceStorage(PythonUtils.arrayCopyOf(storage.getInternalObjectArray(), storage.length()));
         }
 
         @Specialization
@@ -3608,12 +3608,12 @@ public static Object[] executeUncached(SequenceStorage s) {
 
         @Specialization
         static Object[] doObjectSequenceStorage(ObjectSequenceStorage s) {
-            return s.getInternalArray();
+            return s.getInternalObjectArray();
         }
 
         @Specialization
         static Object[] doMroSequenceStorage(MroSequenceStorage s) {
-            return s.getInternalArray();
+            return s.getInternalClassArray();
         }
 
         @Specialization(guards = "!isObjectStorage(s) || isMroStorage(s)")

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

@@ -236,7 +236,7 @@ void sort(DoubleSequenceStorage storage, @SuppressWarnings("unused") PNone keyfu
 
         @TruffleBoundary
         private static void sortStrings(ObjectSequenceStorage storage, boolean reverse) {
-            Object[] array = storage.getInternalArray();
+            Object[] array = storage.getInternalObjectArray();
             int len = storage.length();
             Comparator<Object> comparator;
             if (reverse) {
@@ -250,7 +250,7 @@ private static void sortStrings(ObjectSequenceStorage storage, boolean reverse)
         protected boolean isStringOnly(Node inliningTarget, ObjectSequenceStorage storage, InlinedLoopConditionProfile isStringOnlyLoopProfile,
                         InlinedCountingConditionProfile isStringOnlyBreakProfile) {
             int length = storage.length();
-            Object[] array = storage.getInternalArray();
+            Object[] array = storage.getInternalObjectArray();
             for (int i = 0; isStringOnlyLoopProfile.profile(inliningTarget, i < length); i++) {
                 Object value = array[i];
                 if (isStringOnlyBreakProfile.profile(inliningTarget, !(value instanceof TruffleString))) {
@@ -276,15 +276,15 @@ void sortObjSeqStorage(VirtualFrame frame, ObjectSequenceStorage storage, @Suppr
                 // specialized code with generic object storage code
                 sortStrings(storage, reverse);
             } else {
-                sortWithoutKey(frame, storage.getInternalArray(), storage.length(), reverse, callContext);
+                sortWithoutKey(frame, storage.getInternalObjectArray(), storage.length(), reverse, callContext);
             }
         }
 
         @Specialization(guards = "!isPNone(keyfunc)")
         void sort(VirtualFrame frame, ObjectSequenceStorage storage, Object keyfunc, boolean reverse,
                         @Shared @Cached CallNode callNode,
                         @Shared @Cached CallContext callContext) {
-            sortWithKey(frame, storage.getInternalArray(), storage.length(), keyfunc, reverse, callNode, callContext);
+            sortWithKey(frame, storage.getInternalObjectArray(), storage.length(), keyfunc, reverse, callNode, callContext);
         }
 
         @Fallback

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/StructSequence.java

@@ -460,7 +460,7 @@ PTuple reduce(PTuple self,
                         @Cached GetClassNode getClass,
                         @Cached PythonObjectFactory factory) {
             assert self.getSequenceStorage() instanceof ObjectSequenceStorage;
-            Object[] data = CompilerDirectives.castExact(self.getSequenceStorage(), ObjectSequenceStorage.class).getInternalArray();
+            Object[] data = CompilerDirectives.castExact(self.getSequenceStorage(), ObjectSequenceStorage.class).getInternalObjectArray();
             assert data.length == fieldNames.length;
             PTuple seq;
             PDict dict;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonManagedClass.java

@@ -316,14 +316,14 @@ private void unsafeSetSuperClass(PythonAbstractClass... newBaseClasses) {
     public final void setBases(Object newBaseClass, PythonAbstractClass[] newBaseClasses) {
         Object oldBase = getBase();
         PythonAbstractClass[] oldBaseClasses = getBaseClasses();
-        PythonAbstractClass[] oldMRO = (PythonAbstractClass[]) this.methodResolutionOrder.getInternalArray();
+        PythonAbstractClass[] oldMRO = this.methodResolutionOrder.getInternalClassArray();
 
         PythonAbstractClass[] subclassesArray = GetSubclassesAsArrayNode.executeUncached(this);
         PythonAbstractClass[][] oldSubClasssMROs = new PythonAbstractClass[subclassesArray.length][];
         for (int i = 0; i < subclassesArray.length; i++) {
             PythonAbstractClass scls = subclassesArray[i];
             if (scls instanceof PythonManagedClass) {
-                oldSubClasssMROs[i] = (PythonAbstractClass[]) ((PythonManagedClass) scls).methodResolutionOrder.getInternalArray();
+                oldSubClasssMROs[i] = ((PythonManagedClass) scls).methodResolutionOrder.getInternalClassArray();
             }
         }
 

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

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

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

@@ -69,20 +69,6 @@ public BoolSequenceStorage createEmpty(int newLength) {
         return new BoolSequenceStorage(newLength);
     }
 
-    @Override
-    public Object[] getInternalArray() {
-        /*
-         * Have to box and copy.
-         */
-        Object[] boxed = new Object[length];
-
-        for (int i = 0; i < length; i++) {
-            boxed[i] = values[i];
-        }
-
-        return boxed;
-    }
-
     public void insertBoolItem(int idx, boolean value) {
         ensureCapacity(length + 1);
 
@@ -151,7 +137,16 @@ public Object getCopyOfInternalArrayObject() {
     }
 
     public Object[] getCopyOfInternalArray() {
-        return getInternalArray();
+        /*
+         * Have to box and copy.
+         */
+        Object[] boxed = new Object[length];
+
+        for (int i = 0; i < length; i++) {
+            boxed[i] = values[i];
+        }
+
+        return boxed;
     }
 
     @Override

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

@@ -77,20 +77,6 @@ public ByteSequenceStorage createEmpty(int newCapacity) {
         return new ByteSequenceStorage(newCapacity);
     }
 
-    @Override
-    public Object[] getInternalArray() {
-        /*
-         * Have to box and copy.
-         */
-        Object[] boxed = new Object[length];
-
-        for (int i = 0; i < length; i++) {
-            boxed[i] = values[i];
-        }
-
-        return boxed;
-    }
-
     public void reverse() {
         if (length > 0) {
             int head = 0;
@@ -178,7 +164,16 @@ public Object getCopyOfInternalArrayObject() {
     }
 
     public Object[] getCopyOfInternalArray() {
-        return getInternalArray();
+        /*
+         * Have to box and copy.
+         */
+        Object[] boxed = new Object[length];
+
+        for (int i = 0; i < length; i++) {
+            boxed[i] = values[i];
+        }
+
+        return boxed;
     }
 
     @Override