remove BasicSequenceStorage

Author: horakivo

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextObjectBuiltins.java

@@ -137,7 +137,6 @@
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.ArrayBasedSequenceStorage;
-import com.oracle.graal.python.runtime.sequence.storage.BasicSequenceStorage;
 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.SequenceStorage;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PySequenceArrayWrapper.java

@@ -48,7 +48,7 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.StorageToNativeNodeGen;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.runtime.sequence.PSequence;
-import com.oracle.graal.python.runtime.sequence.storage.BasicSequenceStorage;
+import com.oracle.graal.python.runtime.sequence.storage.ArrayBasedSequenceStorage;
 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.MroSequenceStorage;
@@ -84,7 +84,7 @@ public static NativeSequenceStorage executeUncached(SequenceStorage object, bool
         }
 
         @Specialization(guards = "!isMroSequenceStorage(s)")
-        static NativeSequenceStorage doManaged(Node inliningTarget, BasicSequenceStorage s, boolean isBytesLike,
+        static NativeSequenceStorage doManaged(Node inliningTarget, ArrayBasedSequenceStorage s, boolean isBytesLike,
                         @Exclusive @Cached SequenceStorageNodes.StorageToNativeNode storageToNativeNode,
                         @Cached SequenceStorageNodes.GetInternalObjectArrayNode getInternalArrayNode) {
             Object array;

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

@@ -26,7 +26,6 @@
 package com.oracle.graal.python.builtins.objects.common;
 
 import static com.oracle.graal.python.builtins.objects.iterator.IteratorBuiltins.NextHelperNode.STOP_MARKER;
-import static com.oracle.graal.python.nodes.truffle.TruffleStringMigrationHelpers.assertNoJavaString;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.IndexError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.MemoryError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/PList.java

@@ -33,7 +33,7 @@
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.sequence.PSequence;
-import com.oracle.graal.python.runtime.sequence.storage.BasicSequenceStorage;
+import com.oracle.graal.python.runtime.sequence.storage.ArrayBasedSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -243,7 +243,7 @@ public int updateFrom(int newSizeEstimate) {
             }
         }
 
-        void reportUpdatedCapacity(BasicSequenceStorage newStore);
+        void reportUpdatedCapacity(ArrayBasedSequenceStorage newStore);
 
         SourceSection getSourceSection();
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PGuards.java

@@ -108,7 +108,6 @@
 import com.oracle.graal.python.nodes.object.GetClassNode.GetPythonObjectClassNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.sequence.PSequence;
-import com.oracle.graal.python.runtime.sequence.storage.BasicSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.DoubleSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.EmptySequenceStorage;
@@ -253,10 +252,6 @@ public static boolean isEmptyStorage(PSequence sequence) {
         return sequence.getSequenceStorage() instanceof EmptySequenceStorage;
     }
 
-    public static boolean isBasicStorage(PSequence sequence) {
-        return sequence.getSequenceStorage() instanceof BasicSequenceStorage;
-    }
-
     public static boolean isIntStorage(PSequence sequence) {
         return sequence.getSequenceStorage() instanceof IntSequenceStorage;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/ListNodes.java

@@ -78,7 +78,7 @@
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.PSequence;
-import com.oracle.graal.python.runtime.sequence.storage.BasicSequenceStorage;
+import com.oracle.graal.python.runtime.sequence.storage.ArrayBasedSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.NativeObjectSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
@@ -344,17 +344,17 @@ public static void appendObjectGeneric(PList list, Object value,
                 SequenceStorage newStore = SequenceStorageNodes.AppendNode.executeUncached(list.getSequenceStorage(), value, ListGeneralizationNode.SUPPLIER);
                 updateStoreProfile[0] = BranchProfile.create();
                 list.setSequenceStorage(newStore);
-                if (list.getOrigin() != null && newStore instanceof BasicSequenceStorage) {
-                    list.getOrigin().reportUpdatedCapacity((BasicSequenceStorage) newStore);
+                if (list.getOrigin() != null && newStore instanceof ArrayBasedSequenceStorage newArrayBasedStore) {
+                    list.getOrigin().reportUpdatedCapacity(newArrayBasedStore);
                 }
             } else {
                 SequenceStorage newStore = appendNode.execute(inliningTarget, list.getSequenceStorage(), value, ListGeneralizationNode.SUPPLIER);
                 if (list.getSequenceStorage() != newStore) {
                     updateStoreProfile[0].enter();
                     list.setSequenceStorage(newStore);
                 }
-                if (CompilerDirectives.inInterpreter() && list.getOrigin() != null && newStore instanceof BasicSequenceStorage) {
-                    list.getOrigin().reportUpdatedCapacity((BasicSequenceStorage) newStore);
+                if (CompilerDirectives.inInterpreter() && list.getOrigin() != null && newStore instanceof ArrayBasedSequenceStorage newArrayBasedStore) {
+                    list.getOrigin().reportUpdatedCapacity(newArrayBasedStore);
                 }
             }
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/SequenceFromStackNode.java

@@ -47,7 +47,7 @@
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
-import com.oracle.graal.python.runtime.sequence.storage.BasicSequenceStorage;
+import com.oracle.graal.python.runtime.sequence.storage.ArrayBasedSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.BoolSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.DoubleSequenceStorage;
@@ -261,7 +261,7 @@ public SourceSection getSourceSection() {
         }
 
         @Override
-        public void reportUpdatedCapacity(BasicSequenceStorage newStore) {
+        public void reportUpdatedCapacity(ArrayBasedSequenceStorage newStore) {
             if (CompilerDirectives.inInterpreter()) {
                 if (PythonContext.get(this).getOption(PythonOptions.OverallocateLiteralLists)) {
                     if (newStore.getCapacity() > initialCapacity.estimate()) {

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

@@ -40,7 +40,7 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
-public abstract class ArrayBasedSequenceStorage extends BasicSequenceStorage {
+public abstract class ArrayBasedSequenceStorage extends SequenceStorage {
 
     public abstract Object getInternalArrayObject();
 

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

@@ -57,25 +57,6 @@ public static SequenceStorage createStorage(Object[] values) {
         }
     }
 
-    public static BasicSequenceStorage createStorage(Object baseValue, int len) {
-        assert baseValue != null;
-
-        if (baseValue instanceof Integer) {
-            return new IntSequenceStorage(len);
-        } else if (baseValue instanceof Byte) {
-            return new ByteSequenceStorage(len);
-        } else if (baseValue instanceof Long) {
-            return new LongSequenceStorage(len);
-        } else if (baseValue instanceof Double) {
-            return new DoubleSequenceStorage(len);
-        } else if (baseValue instanceof Boolean) {
-            return new BoolSequenceStorage(len);
-        } else {
-            return new ObjectSequenceStorage(len);
-        }
-
-    }
-
     private static boolean canSpecializeToInt(Object[] values) {
         for (Object item : values) {
             if (!(item instanceof Integer)) {