[GR-19973] Revert "Remove getElementTypeNode"

qunaibit · qunaibit · commit 66803f9f7c86 · 2020-04-10T07:07:40.000Z
PullRequest: graalpython/881
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java
@@ -27,10 +27,6 @@
 
 public abstract class BasicSequenceStorage extends SequenceStorage {
 
-    public BasicSequenceStorage(ListStorageType type) {
-        super(type);
-    }
-
     // nominated storage length
     protected int length;
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BoolSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BoolSequenceStorage.java
@@ -32,7 +32,6 @@ public final class BoolSequenceStorage extends TypedSequenceStorage {
     private boolean[] values;
 
     public BoolSequenceStorage() {
-        super(ListStorageType.Boolean);
         values = new boolean[]{};
     }
 
@@ -41,14 +40,12 @@ public BoolSequenceStorage(boolean[] elements) {
     }
 
     public BoolSequenceStorage(boolean[] elements, int length) {
-        super(ListStorageType.Boolean);
         this.values = elements;
         this.capacity = values.length;
         this.length = length;
     }
 
     public BoolSequenceStorage(int capacity) {
-        super(ListStorageType.Boolean);
         this.values = new boolean[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -262,4 +259,9 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (boolean[]) arrayObject;
     }
+
+    @Override
+    public ListStorageType getElementType() {
+        return ListStorageType.Boolean;
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ByteSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ByteSequenceStorage.java
@@ -44,14 +44,12 @@ public ByteSequenceStorage(byte[] elements) {
     }
 
     public ByteSequenceStorage(byte[] elements, int length) {
-        super(ListStorageType.Byte);
         this.values = elements;
         this.capacity = values.length;
         this.length = length;
     }
 
     public ByteSequenceStorage(int capacity) {
-        super(ListStorageType.Byte);
         this.values = new byte[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -368,4 +366,9 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (byte[]) arrayObject;
     }
+
+    @Override
+    public ListStorageType getElementType() {
+        return ListStorageType.Byte;
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/CharSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/CharSequenceStorage.java
@@ -47,14 +47,12 @@ public final class CharSequenceStorage extends TypedSequenceStorage {
     private char[] values;
 
     public CharSequenceStorage(char[] elements) {
-        super(ListStorageType.Char);
         this.values = elements;
         this.capacity = values.length;
         this.length = elements.length;
     }
 
     public CharSequenceStorage(int capacity) {
-        super(ListStorageType.Char);
         this.values = new char[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -157,6 +155,11 @@ public void setInternalArrayObject(Object arrayObject) {
         this.values = (char[]) arrayObject;
     }
 
+    @Override
+    public ListStorageType getElementType() {
+        return ListStorageType.Char;
+    }
+
     public void setCharItemNormalized(int idx, char value) {
         values[idx] = value;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/DoubleSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/DoubleSequenceStorage.java
@@ -34,26 +34,22 @@ public final class DoubleSequenceStorage extends TypedSequenceStorage {
     private double[] values;
 
     public DoubleSequenceStorage() {
-        super(ListStorageType.Double);
         values = new double[]{};
     }
 
     public DoubleSequenceStorage(double[] elements) {
-        super(ListStorageType.Double);
         this.values = elements;
         this.capacity = elements.length;
         this.length = elements.length;
     }
 
     public DoubleSequenceStorage(double[] elements, int length) {
-        super(ListStorageType.Double);
         this.values = elements;
         this.capacity = elements.length;
         this.length = length;
     }
 
     public DoubleSequenceStorage(int capacity) {
-        super(ListStorageType.Double);
         this.values = new double[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -267,4 +263,9 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (double[]) arrayObject;
     }
+
+    @Override
+    public ListStorageType getElementType() {
+        return ListStorageType.Double;
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/EmptySequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/EmptySequenceStorage.java
@@ -35,10 +35,6 @@
 
 public final class EmptySequenceStorage extends SequenceStorage {
 
-    public EmptySequenceStorage() {
-        super(ListStorageType.Empty);
-    }
-
     public static final EmptySequenceStorage INSTANCE = new EmptySequenceStorage();
 
     @Override
@@ -156,4 +152,9 @@ public void ensureCapacity(int newCapacity) {
     public Object getInternalArrayObject() {
         return null;
     }
+
+    @Override
+    public ListStorageType getElementType() {
+        return ListStorageType.Empty;
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/IntSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/IntSequenceStorage.java
@@ -34,26 +34,22 @@ public final class IntSequenceStorage extends TypedSequenceStorage {
     private int[] values;
 
     public IntSequenceStorage() {
-        super(ListStorageType.Int);
         values = new int[]{};
     }
 
     public IntSequenceStorage(int[] elements) {
-        super(ListStorageType.Int);
         this.values = elements;
         this.capacity = values.length;
         this.length = elements.length;
     }
 
     public IntSequenceStorage(int[] elements, int length) {
-        super(ListStorageType.Int);
         this.values = elements;
         this.capacity = values.length;
         this.length = length;
     }
 
     public IntSequenceStorage(int capacity) {
-        super(ListStorageType.Int);
         this.values = new int[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -267,4 +263,9 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (int[]) arrayObject;
     }
+
+    @Override
+    public ListStorageType getElementType() {
+        return ListStorageType.Int;
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ListSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ListSequenceStorage.java
@@ -34,21 +34,18 @@ public final class ListSequenceStorage extends TypedSequenceStorage {
     private PList[] values;
 
     public ListSequenceStorage(PList[] elements) {
-        super(ListStorageType.List);
         this.values = elements;
         capacity = values.length;
         length = elements.length;
     }
 
     public ListSequenceStorage(PList[] elements, int length) {
-        super(ListStorageType.List);
         this.values = elements;
         capacity = values.length;
         this.length = length;
     }
 
     public ListSequenceStorage(int capacity) {
-        super(ListStorageType.List);
         this.values = new PList[capacity];
         this.capacity = capacity;
         length = 0;
@@ -267,4 +264,9 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (PList[]) arrayObject;
     }
+
+    @Override
+    public ListStorageType getElementType() {
+        return ListStorageType.List;
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/LongSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/LongSequenceStorage.java
@@ -35,26 +35,22 @@ public final class LongSequenceStorage extends TypedSequenceStorage {
     private long[] values;
 
     public LongSequenceStorage() {
-        super(ListStorageType.Long);
         values = new long[]{};
     }
 
     public LongSequenceStorage(long[] elements) {
-        super(ListStorageType.Long);
         this.values = elements;
         this.capacity = values.length;
         this.length = elements.length;
     }
 
     public LongSequenceStorage(long[] elements, int length) {
-        super(ListStorageType.Long);
         this.values = elements;
         this.capacity = values.length;
         this.length = length;
     }
 
     public LongSequenceStorage(int capacity) {
-        super(ListStorageType.Long);
         this.values = new long[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -272,4 +268,9 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (long[]) arrayObject;
     }
+
+    @Override
+    public ListStorageType getElementType() {
+        return ListStorageType.Long;
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/MroSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/MroSequenceStorage.java
@@ -72,7 +72,6 @@ public final class MroSequenceStorage extends TypedSequenceStorage {
     @CompilationFinal(dimensions = 1) private PythonAbstractClass[] values;
 
     public MroSequenceStorage(String className, PythonAbstractClass[] elements) {
-        super(ListStorageType.Generic);
         this.className = className;
         this.values = elements;
         this.capacity = elements.length;
@@ -81,7 +80,6 @@ public MroSequenceStorage(String className, PythonAbstractClass[] elements) {
     }
 
     public MroSequenceStorage(String className, int capacity) {
-        super(ListStorageType.Generic);
         this.className = className;
         this.values = new PythonAbstractClass[capacity];
         this.capacity = capacity;
@@ -254,6 +252,11 @@ public void setInternalArrayObject(Object arrayObject) {
         this.capacity = classArray.length;
     }
 
+    @Override
+    public ListStorageType getElementType() {
+        return ListStorageType.Generic;
+    }
+
     public Assumption getLookupStableAssumption() {
         return lookupStableAssumption.getAssumption();
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/NativeSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/NativeSequenceStorage.java
@@ -53,11 +53,13 @@ public class NativeSequenceStorage extends SequenceStorage {
     /* allocated capacity */
     protected int capacity;
 
+    protected final ListStorageType elementType;
+
     public NativeSequenceStorage(Object ptr, int length, int capacity, ListStorageType elementType) {
-        super(elementType);
         this.ptr = ptr;
         this.capacity = capacity;
         this.len = length;
+        this.elementType = elementType;
     }
 
     public Object getPtr() {
@@ -76,6 +78,11 @@ public void setCapacity(int capacity) {
         this.capacity = capacity;
     }
 
+    @Override
+    public ListStorageType getElementType() {
+        return elementType;
+    }
+
     @Override
     public final int length() {
         return len;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ObjectSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ObjectSequenceStorage.java
@@ -34,21 +34,18 @@ public final class ObjectSequenceStorage extends BasicSequenceStorage {
     private Object[] values;
 
     public ObjectSequenceStorage(Object[] elements) {
-        super(ListStorageType.Generic);
         this.values = elements;
         this.capacity = elements.length;
         this.length = elements.length;
     }
 
     public ObjectSequenceStorage(Object[] elements, int length) {
-        super(ListStorageType.Generic);
         this.values = elements;
         this.capacity = elements.length;
         this.length = length;
     }
 
     public ObjectSequenceStorage(int capacity) {
-        super(ListStorageType.Generic);
         this.values = new Object[capacity];
         this.capacity = capacity;
         this.length = 0;
@@ -201,4 +198,9 @@ public Object getCopyOfInternalArrayObject() {
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (Object[]) arrayObject;
     }
+
+    @Override
+    public ListStorageType getElementType() {
+        return ListStorageType.Generic;
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/RangeSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/RangeSequenceStorage.java
@@ -47,7 +47,6 @@ public class RangeSequenceStorage extends SequenceStorage {
     private final PRange range;
 
     public RangeSequenceStorage(PRange range) {
-        super(ListStorageType.Int);
         this.range = range;
     }
 
@@ -80,6 +79,11 @@ public Object getInternalArrayObject() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public ListStorageType getElementType() {
+        return ListStorageType.Int;
+    }
+
     @Override
     public Object[] getInternalArray() {
         throw new UnsupportedOperationException();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java
@@ -27,16 +27,6 @@
 
 public abstract class SequenceStorage {
 
-    protected final ListStorageType elementType;
-
-    public SequenceStorage(ListStorageType type) {
-        this.elementType = type;
-    }
-
-    public final ListStorageType getElementType() {
-        return elementType;
-    }
-
     public enum ListStorageType {
         Uninitialized,
         Empty,
@@ -86,6 +76,8 @@ public boolean generalizesFrom(ListStorageType other) {
      */
     public abstract Object getInternalArrayObject();
 
+    public abstract ListStorageType getElementType();
+
     public abstract Object[] getInternalArray();
 
     public abstract Object[] getCopyOfInternalArray();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/TupleSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/TupleSequenceStorage.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/TypedSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/TypedSequenceStorage.java

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ public final class BoolSequenceStorage extends TypedSequenceStorage {`
`32`	`32`	`private boolean[] values;`
`33`	`33`
`34`	`34`	`public BoolSequenceStorage() {`
`35`		`- super(ListStorageType.Boolean);`
`36`	`35`	`values = new boolean[]{};`
`37`	`36`	`}`
`38`	`37`
`@@ -41,14 +40,12 @@ public BoolSequenceStorage(boolean[] elements) {`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`public BoolSequenceStorage(boolean[] elements, int length) {`
`44`		`- super(ListStorageType.Boolean);`
`45`	`43`	`this.values = elements;`
`46`	`44`	`this.capacity = values.length;`
`47`	`45`	`this.length = length;`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`public BoolSequenceStorage(int capacity) {`
`51`		`- super(ListStorageType.Boolean);`
`52`	`49`	`this.values = new boolean[capacity];`
`53`	`50`	`this.capacity = capacity;`
`54`	`51`	`this.length = 0;`
`@@ -262,4 +259,9 @@ public Object getCopyOfInternalArrayObject() {`
`262`	`259`	`public void setInternalArrayObject(Object arrayObject) {`
`263`	`260`	`this.values = (boolean[]) arrayObject;`
`264`	`261`	`}`
	`262`	`+`
	`263`	`+ @Override`
	`264`	`+ public ListStorageType getElementType() {`
	`265`	`+ return ListStorageType.Boolean;`
	`266`	`+ }`
`265`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,12 @@ public ByteSequenceStorage(byte[] elements) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public ByteSequenceStorage(byte[] elements, int length) {`
`47`		`- super(ListStorageType.Byte);`
`48`	`47`	`this.values = elements;`
`49`	`48`	`this.capacity = values.length;`
`50`	`49`	`this.length = length;`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`public ByteSequenceStorage(int capacity) {`
`54`		`- super(ListStorageType.Byte);`
`55`	`53`	`this.values = new byte[capacity];`
`56`	`54`	`this.capacity = capacity;`
`57`	`55`	`this.length = 0;`
`@@ -368,4 +366,9 @@ public Object getCopyOfInternalArrayObject() {`
`368`	`366`	`public void setInternalArrayObject(Object arrayObject) {`
`369`	`367`	`this.values = (byte[]) arrayObject;`
`370`	`368`	`}`
	`369`	`+`
	`370`	`+ @Override`
	`371`	`+ public ListStorageType getElementType() {`
	`372`	`+ return ListStorageType.Byte;`
	`373`	`+ }`
`371`	`374`	`}`