Remove SequenceStorage.equals

Author: msimacek

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

@@ -38,6 +38,8 @@
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.CompilerDirectives.ValueType;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
@@ -46,7 +48,6 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
-import com.oracle.truffle.api.library.ExportMessage.Ignore;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.source.SourceSection;
@@ -70,12 +71,12 @@ public PList(Object cls, Shape instanceShape, SequenceStorage store, ListOrigin
     }
 
     @Override
-    public final SequenceStorage getSequenceStorage() {
+    public SequenceStorage getSequenceStorage() {
         return store;
     }
 
     @Override
-    public final void setSequenceStorage(SequenceStorage newStorage) {
+    public void setSequenceStorage(SequenceStorage newStorage) {
         this.store = newStorage;
     }
 
@@ -85,25 +86,6 @@ public String toString() {
         return String.format("list(%s)", store);
     }
 
-    @Ignore
-    @Override
-    public final boolean equals(Object other) {
-        if (!(other instanceof PList)) {
-            return false;
-        }
-        if (this == other) {
-            return true;
-        }
-        PList otherList = (PList) other;
-        SequenceStorage otherStore = otherList.getSequenceStorage();
-        return store.equals(otherStore);
-    }
-
-    @Override
-    public final int hashCode() {
-        return super.hashCode();
-    }
-
     public ListOrigin getOrigin() {
         return origin;
     }
@@ -230,12 +212,12 @@ public interface ListOrigin {
          * to reach a size one larger than the current estimate to increase the estimate for new
          * lists.
          */
-        @CompilerDirectives.ValueType
-        public static final class SizeEstimate {
+        @ValueType
+        final class SizeEstimate {
             private static final int NUM_DIGITS = 3;
             private static final int NUM_DIGITS_POW2 = 1 << NUM_DIGITS;
 
-            @CompilerDirectives.CompilationFinal private int shiftedStorageSizeEstimate;
+            @CompilationFinal private int shiftedStorageSizeEstimate;
 
             public SizeEstimate(int storageSizeEstimate) {
                 assert storageSizeEstimate >= 0;

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

@@ -25,15 +25,11 @@
  */
 package com.oracle.graal.python.builtins.objects.tuple;
 
-import com.oracle.graal.python.builtins.PythonBuiltinClassType;
-import com.oracle.graal.python.nodes.ErrorMessages;
-import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.MroSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.ObjectSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
@@ -75,24 +71,6 @@ public void setSequenceStorage(SequenceStorage store) {
         this.store = store;
     }
 
-    @Override
-    @ExportMessage.Ignore
-    public boolean equals(Object other) {
-        CompilerAsserts.neverPartOfCompilation();
-        if (!(other instanceof PTuple)) {
-            return false;
-        }
-
-        PTuple otherTuple = (PTuple) other;
-        return store.equals(otherTuple.store);
-    }
-
-    @Override
-    public int hashCode() {
-        CompilerAsserts.neverPartOfCompilation();
-        return super.hashCode();
-    }
-
     public long getHash() {
         return hash;
     }
@@ -101,12 +79,6 @@ public void setHash(long hash) {
         this.hash = hash;
     }
 
-    @SuppressWarnings({"static-method", "unused"})
-    public static void setItem(int idx, Object value) {
-        CompilerDirectives.transferToInterpreterAndInvalidate();
-        throw PRaiseNode.raiseUncached(null, PythonBuiltinClassType.PTuple, ErrorMessages.OBJ_DOES_NOT_SUPPORT_ITEM_ASSIGMENT);
-    }
-
     @ExportMessage
     @SuppressWarnings("unused")
     public static boolean isArrayElementModifiable(PTuple self, long index) {

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

@@ -166,22 +166,6 @@ public Object getIndicativeValue() {
         return false;
     }
 
-    @Override
-    public boolean equals(SequenceStorage other) {
-        if (other.length() != length() || !(other instanceof BoolSequenceStorage)) {
-            return false;
-        }
-
-        boolean[] otherArray = ((BoolSequenceStorage) other).getInternalBoolArray();
-        for (int i = 0; i < length(); i++) {
-            if (values[i] != otherArray[i]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     @Override
     public Object getInternalArrayObject() {
         return values;

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

@@ -199,22 +199,6 @@ public Object getIndicativeValue() {
         return 0;
     }
 
-    @Override
-    public boolean equals(SequenceStorage other) {
-        if (other.length() != length() || !(other instanceof ByteSequenceStorage)) {
-            return false;
-        }
-
-        byte[] otherArray = ((ByteSequenceStorage) other).getInternalByteArray();
-        for (int i = 0; i < length(); i++) {
-            if (values[i] != otherArray[i]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     @Override
     public Object getInternalArrayObject() {
         return values;

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

@@ -178,22 +178,6 @@ public Object getIndicativeValue() {
         return .0;
     }
 
-    @Override
-    public boolean equals(SequenceStorage other) {
-        if (other.length() != length()) {
-            return false;
-        }
-
-        double[] otherArray = ((DoubleSequenceStorage) other).getInternalDoubleArray();
-        for (int i = 0; i < length(); i++) {
-            if (values[i] != otherArray[i]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     @Override
     public Object getInternalArrayObject() {
         return values;

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

@@ -88,11 +88,6 @@ public SequenceStorage getSliceInBound(int start, int stop, int step, int len) {
         return this;
     }
 
-    @Override
-    public boolean equals(SequenceStorage other) {
-        return other == EmptySequenceStorage.INSTANCE;
-    }
-
     @Override
     public ListStorageType getElementType() {
         return ListStorageType.Empty;

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

@@ -178,22 +178,6 @@ public Object getIndicativeValue() {
         return 0;
     }
 
-    @Override
-    public boolean equals(SequenceStorage other) {
-        if (other.length() != length() || !(other instanceof IntSequenceStorage)) {
-            return false;
-        }
-
-        int[] otherArray = ((IntSequenceStorage) other).getInternalIntArray();
-        for (int i = 0; i < length(); i++) {
-            if (values[i] != otherArray[i]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     @Override
     public Object getInternalArrayObject() {
         return values;

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

@@ -188,22 +188,6 @@ public Object getIndicativeValue() {
         return 0;
     }
 
-    @Override
-    public boolean equals(SequenceStorage other) {
-        if (other.length() != length() || !(other instanceof LongSequenceStorage)) {
-            return false;
-        }
-
-        long[] otherArray = ((LongSequenceStorage) other).getInternalLongArray();
-        for (int i = 0; i < length(); i++) {
-            if (values[i] != otherArray[i]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     @Override
     public Object getInternalArrayObject() {
         return values;

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

@@ -177,12 +177,6 @@ public Object getIndicativeValue() {
         return null;
     }
 
-    @Override
-    public boolean equals(SequenceStorage other) {
-        Object[] otherArray = other.getInternalArray();
-        return Arrays.equals(values, otherArray);
-    }
-
     @Override
     public Object getInternalArrayObject() {
         return values;

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

@@ -112,11 +112,6 @@ public final SequenceStorage getSliceInBound(int start, int stop, int step, int
         throw CompilerDirectives.shouldNotReachHere();
     }
 
-    @Override
-    public final boolean equals(SequenceStorage other) {
-        throw CompilerDirectives.shouldNotReachHere();
-    }
-
     @Override
     public final SequenceStorage generalizeFor(Object value, SequenceStorage other) {
         throw CompilerDirectives.shouldNotReachHere();