Fix native bytes __hash__

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java

@@ -40,6 +40,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETNEWARGS__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GT__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__HASH__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__IMOD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INIT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ITER__;
@@ -439,6 +440,34 @@ public Object mul(@SuppressWarnings("unused") Object self, Object other) {
         }
     }
 
+    @Builtin(name = __HASH__, minNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    abstract static class HashNode extends PythonUnaryBuiltinNode {
+        @Specialization(guards = "isByteStorage(self)")
+        @TruffleBoundary
+        static long hash(PBytes self) {
+            ByteSequenceStorage storage = (ByteSequenceStorage) self.getSequenceStorage();
+            byte[] array = storage.getInternalByteArray();
+            int len = storage.length();
+            int result = 1;
+            for (int i = 0; i < len; i++) {
+                result = 31 * result + array[i];
+            }
+            return result;
+        }
+
+        @Specialization(guards = "!isByteStorage(self)", limit = "1")
+        static long hashNative(PBytes self,
+                        @CachedLibrary("self") PythonBufferAccessLibrary bufferLib) {
+            int result = 1;
+            int len = bufferLib.getBufferLength(self);
+            for (int i = 0; i < len; i++) {
+                result = 31 * result + bufferLib.readByte(self, i);
+            }
+            return result;
+        }
+    }
+
     @Builtin(name = __EQ__, minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     public abstract static class EqNode extends PythonBinaryBuiltinNode {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java

@@ -27,8 +27,6 @@
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.BufferError;
 
-import java.util.Arrays;
-
 import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAccessLibrary;
 import com.oracle.graal.python.builtins.objects.common.IndexNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
@@ -50,7 +48,6 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 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.object.Shape;
 
 @ExportLibrary(InteropLibrary.class)
@@ -83,24 +80,6 @@ public String formatByteArray(String typeName) {
         }
     }
 
-    @Ignore
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof PByteArray)) {
-            return false;
-        }
-        if (this == obj) {
-            return true;
-        }
-        PByteArray other = (PByteArray) obj;
-        return Arrays.equals(store.getInternalArray(), other.store.getInternalArray());
-    }
-
-    @Override
-    public final int hashCode() {
-        return Arrays.hashCode(store.getInternalArray());
-    }
-
     public final void reverse() {
         store.reverse();
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PBytes.java

@@ -27,21 +27,17 @@
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.BufferError;
 
-import java.util.Arrays;
-
 import com.oracle.graal.python.builtins.objects.buffer.BufferFlags;
 import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAcquireLibrary;
 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.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.interop.InteropLibrary;
 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.object.Shape;
 
 @ExportLibrary(InteropLibrary.class)
@@ -71,34 +67,6 @@ public String toString() {
         }
     }
 
-    @Ignore
-    @Override
-    public final boolean equals(Object other) {
-        // TODO(fa) really required ?
-        if (!(other instanceof PSequence)) {
-            return false;
-        } else {
-            return equals((PSequence) other);
-        }
-    }
-
-    @Ignore
-    public final boolean equals(PSequence other) {
-        CompilerAsserts.neverPartOfCompilation();
-        PSequence otherSeq = other;
-        SequenceStorage otherStore = otherSeq.getSequenceStorage();
-        return store.equals(otherStore);
-    }
-
-    @Override
-    public final int hashCode() {
-        // TODO(fa) really required ?
-        if (store instanceof ByteSequenceStorage) {
-            return Arrays.hashCode(((ByteSequenceStorage) store).getInternalByteArray());
-        }
-        return store.hashCode();
-    }
-
     @ExportMessage
     @SuppressWarnings("unused")
     public static boolean isArrayElementModifiable(PBytes self, long index) {