Remove TypedSequenceStorage

Author: horakivo

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

@@ -128,7 +128,6 @@
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage.StorageType;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorageFactory;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStoreException;
-import com.oracle.graal.python.runtime.sequence.storage.TypedSequenceStorage;
 import com.oracle.graal.python.util.BiFunction;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.graal.python.util.PythonUtils;
@@ -3387,7 +3386,7 @@ static Object[] doObjectSequenceStorage(ObjectSequenceStorage s) {
         }
 
         @Specialization
-        static Object[] doTypedSequenceStorage(Node inliningTarget, TypedSequenceStorage s,
+        static Object[] doArrayBasedSequenceStorage(Node inliningTarget, ArrayBasedSequenceStorage s,
                         @Cached CopyInternalArrayNode copy) {
             Object[] internalArray = copy.execute(inliningTarget, s);
             assert internalArray.length == s.length();
@@ -3405,7 +3404,7 @@ static Object[] doEmptySequenceStorage(@SuppressWarnings("unused") EmptySequence
             return PythonUtils.EMPTY_OBJECT_ARRAY;
         }
 
-        @Specialization(replaces = {"doObjectSequenceStorage", "doTypedSequenceStorage", "doNativeObject", "doEmptySequenceStorage"})
+        @Specialization(replaces = {"doObjectSequenceStorage", "doArrayBasedSequenceStorage", "doNativeObject", "doEmptySequenceStorage"})
         static Object[] doGeneric(Node inliningTarget, SequenceStorage s,
                         @Exclusive @Cached GetItemScalarNode getItemNode) {
             return materializeGeneric(inliningTarget, s, s.length(), getItemNode);
@@ -3473,7 +3472,7 @@ protected final SequenceStorage executeCached(SequenceStorage storage, int index
         protected abstract SequenceStorage execute(Node inliningTarget, SequenceStorage storage, int index, Object value, boolean recursive);
 
         @Specialization
-        protected static SequenceStorage doStorage(EmptySequenceStorage storage, int index, Object value, boolean recursive,
+        protected static SequenceStorage doEmptyStorage(EmptySequenceStorage storage, int index, Object value, boolean recursive,
                         @Shared @Cached(inline = false) InsertItemNode recursiveNode) {
             if (!recursive) {
                 throw CompilerDirectives.shouldNotReachHere();

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

@@ -54,4 +54,9 @@ public abstract class ArrayBasedSequenceStorage extends BasicSequenceStorage {
 
     public abstract ArrayBasedSequenceStorage createEmpty(int newCapacity);
 
+    @Override
+    public ObjectSequenceStorage generalizeFor(Object value, SequenceStorage other) {
+        return new ObjectSequenceStorage(getInternalArray());
+    }
+
 }

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

@@ -29,7 +29,7 @@
 
 import com.oracle.graal.python.util.PythonUtils;
 
-public final class BoolSequenceStorage extends TypedSequenceStorage {
+public final class BoolSequenceStorage extends ArrayBasedSequenceStorage {
 
     private boolean[] values;
 

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

@@ -40,7 +40,7 @@
 import com.oracle.truffle.api.library.ExportMessage;
 
 @ExportLibrary(PythonBufferAccessLibrary.class)
-public final class ByteSequenceStorage extends TypedSequenceStorage {
+public final class ByteSequenceStorage extends ArrayBasedSequenceStorage {
 
     private byte[] values;
 

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

@@ -29,7 +29,7 @@
 
 import com.oracle.graal.python.util.PythonUtils;
 
-public final class DoubleSequenceStorage extends TypedSequenceStorage {
+public final class DoubleSequenceStorage extends ArrayBasedSequenceStorage {
 
     private double[] values;
 

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

@@ -29,7 +29,7 @@
 
 import com.oracle.graal.python.util.PythonUtils;
 
-public final class IntSequenceStorage extends TypedSequenceStorage {
+public final class IntSequenceStorage extends ArrayBasedSequenceStorage {
 
     private int[] values;
 

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

@@ -31,7 +31,7 @@
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.util.PythonUtils;
 
-public final class LongSequenceStorage extends TypedSequenceStorage {
+public final class LongSequenceStorage extends ArrayBasedSequenceStorage {
 
     private long[] values;
 

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

@@ -59,7 +59,7 @@
 import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.api.utilities.CyclicAssumption;
 
-public final class MroSequenceStorage extends TypedSequenceStorage {
+public final class MroSequenceStorage extends ArrayBasedSequenceStorage {
 
     private final TruffleString className;
     /**