Fix int.__hash__()

Author: otethal

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java

@@ -57,6 +57,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.modules.MathGuards;
+import com.oracle.graal.python.builtins.modules.SysModuleBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
 import com.oracle.graal.python.builtins.objects.array.PArray;
@@ -2646,25 +2647,40 @@ private static void validateIntegerSpec(PythonCore core, Spec spec) {
     abstract static class HashNode extends PythonUnaryBuiltinNode {
 
         @Specialization
-        int hash(int self) {
-            return self;
+        long hash(int self) {
+            return PythonObjectLibrary.hash(self);
         }
 
         @Specialization
         long hash(long self) {
-            return self;
+            return PythonObjectLibrary.hash(self);
         }
 
         @Specialization
+        @TruffleBoundary
         long hash(PInt self) {
-            return self.longValue();
+            return self.getValue().remainder(BigInteger.valueOf(SysModuleBuiltins.HASH_MODULUS)).longValue();
         }
 
         @Specialization
+        long hash(PythonNativeVoidPtr self,
+                        @CachedLibrary(limit = "1") InteropLibrary lib) {
+            if (lib.isPointer(self.object)) {
+                try {
+                    long ptrVal = lib.asPointer(self.object);
+                    return PythonObjectLibrary.hash(ptrVal);
+                } catch (UnsupportedMessageException e) {
+                    // fall through
+                }
+            }
+            return doHashCode(self.object);
+        }
+
         @TruffleBoundary
-        long hash(PythonNativeVoidPtr self) {
-            return self.object.hashCode();
+        long doHashCode(Object o) {
+            return o.hashCode();
         }
+
     }
 
     @Builtin(name = "bit_length", minNumOfPositionalArgs = 1)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonIntegerExports.java

@@ -91,12 +91,12 @@ static Object getLazyPythonClass(@SuppressWarnings("unused") Integer value) {
 
     @ExportMessage
     static long hash(Integer value) {
-        return value;
+        return hash(value.intValue());
     }
 
     @Ignore
     static long hash(int value) {
-        return value;
+        return value == -1 ? -2 : value;
     }
 
     @ExportMessage

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonLongExports.java

@@ -41,6 +41,7 @@
 package com.oracle.graal.python.builtins.objects.object;
 
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.modules.SysModuleBuiltins;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
@@ -113,12 +114,13 @@ static Object getLazyPythonClass(@SuppressWarnings("unused") Long value) {
 
     @ExportMessage
     static long hash(Long value) {
-        return value;
+        return hash(value.longValue());
     }
 
     @Ignore
     static long hash(long value) {
-        return value;
+        long h = value % SysModuleBuiltins.HASH_MODULUS;
+        return h == -1 ? -2 : h;
     }
 
     @ExportMessage