Fix float.__hash__()

Author: otethal

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java

@@ -655,49 +655,9 @@ protected static boolean accepts(Object obj) {
     @GenerateNodeFactory
     @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class HashNode extends PythonUnaryBuiltinNode {
-        protected boolean noDecimals(float num) {
-            return num % 1 == 0;
-        }
-
-        protected boolean noDecimals(double num) {
-            return num % 1 == 0;
-        }
-
-        protected boolean noDecimals(PFloat num) {
-            return num.getValue() % 1 == 0;
-        }
-
-        @Specialization(guards = {"noDecimals(self)"})
-        long hashFloatNoDecimals(float self) {
-            return (long) self;
-        }
-
-        @Specialization(guards = {"!noDecimals(self)"})
-        @TruffleBoundary
-        long hashFloatWithDecimals(float self) {
-            return Float.valueOf(self).hashCode();
-        }
-
-        @Specialization(guards = {"noDecimals(self)"})
-        long hashDoubleNoDecimals(double self) {
-            return (long) self;
-        }
-
-        @Specialization(guards = {"!noDecimals(self)"})
-        @TruffleBoundary
-        long hashDoubleWithDecimals(double self) {
-            return Double.valueOf(self).hashCode();
-        }
-
-        @Specialization(guards = {"noDecimals(self)"})
-        long hashPFloatNoDecimals(PFloat self) {
-            return (long) self.getValue();
-        }
-
-        @Specialization(guards = {"!noDecimals(self)"})
-        @TruffleBoundary
-        long hashPFloatWithDecimals(PFloat self) {
-            return Double.valueOf(self.getValue()).hashCode();
+        @Specialization
+        long hashDouble(double self) {
+            return PythonObjectLibrary.hash(self);
         }
     }
 

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

@@ -43,6 +43,8 @@
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.modules.MathModuleBuiltins;
+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;
@@ -81,13 +83,40 @@ static long hash(Double number) {
         return hash(number.doubleValue());
     }
 
+    // Adapted from CPython _Py_HashDouble
     @Ignore
     static long hash(double number) {
-        if (number % 1 == 0) {
-            return (long) number;
-        } else {
-            return Double.doubleToLongBits(number);
+        if (!Double.isFinite(number)) {
+            if (Double.isInfinite(number)) {
+                return number > 0 ? SysModuleBuiltins.HASH_INF : -SysModuleBuiltins.HASH_INF;
+            }
+            return SysModuleBuiltins.HASH_NAN;
+        }
+
+        double[] frexpRes = MathModuleBuiltins.FrexpNode.frexp(number);
+        double m = frexpRes[0];
+        int e = (int) frexpRes[1];
+        int sign = 1;
+        if (m < 0) {
+            sign = -1;
+            m = -m;
+        }
+        long x = 0;
+        while (m != 0.0) {
+            x = ((x << 28) & SysModuleBuiltins.HASH_MODULUS) | x >> (SysModuleBuiltins.HASH_BITS - 28);
+            m *= 268435456.0; /* 2**28 */
+            e -= 28;
+            long y = (long) m; /* pull out integer part */
+            m -= y;
+            x += y;
+            if (x >= SysModuleBuiltins.HASH_MODULUS) {
+                x -= SysModuleBuiltins.HASH_MODULUS;
+            }
         }
+        e = e >= 0 ? e % SysModuleBuiltins.HASH_BITS : SysModuleBuiltins.HASH_BITS - 1 - ((-1 - e) % SysModuleBuiltins.HASH_BITS);
+        x = ((x << e) & SysModuleBuiltins.HASH_MODULUS) | x >> (SysModuleBuiltins.HASH_BITS - e);
+        x = x * sign;
+        return x == -1 ? -2 : x;
     }
 
     @ExportMessage