[GR-27740] Support hash for native float subtype.

PullRequest: graalpython/2044

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py

@@ -326,13 +326,13 @@ def test_float_subclass(self):
         TestFloatSubclass = CPyExtType("TestFloatSubclass",
                                        """
                                        static PyTypeObject* testFloatSubclassPtr = NULL;
- 
+
                                        static PyObject* new_fp(double val) {
                                            PyFloatObject* fp = PyObject_New(PyFloatObject, testFloatSubclassPtr);
                                            fp->ob_fval = val;
                                            return (PyObject*)fp;
                                        }
- 
+
                                        static PyObject* fp_tpnew(PyTypeObject* type, PyObject* args, PyObject* kwargs) {
                                             double dval = 0.0;
                                             Py_XINCREF(args);
@@ -341,7 +341,7 @@ def test_float_subclass(self):
                                             }}
                                             return new_fp(dval);
                                        }
-                                        
+
                                        static PyObject* fp_add(PyObject* l, PyObject* r) {
                                            if (PyFloat_Check(l)) {
                                                if (PyFloat_Check(r)) {
@@ -360,15 +360,16 @@ def test_float_subclass(self):
                                        }
                                        """,
                                        cmembers="PyFloatObject base;",
-                                       tp_base="&PyFloat_Type", 
+                                       tp_base="&PyFloat_Type",
                                        nb_add="fp_add",
                                        tp_new="fp_tpnew",
                                        post_ready_code="testFloatSubclassPtr = &TestFloatSubclassType; Py_INCREF(testFloatSubclassPtr);"
         )
         tester = TestFloatSubclass(41.0)
         res = tester + 1
         assert res == 42.0, "expected 42.0 but was %s" % res
-        
+        assert hash(tester) != 0
+
     def test_custom_basicsize(self):
         TestCustomBasicsize = CPyExtType("TestCustomBasicsize", 
                                       '''

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

@@ -109,6 +109,7 @@
 import com.oracle.graal.python.runtime.formatting.InternalFormat.Spec;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Fallback;
@@ -654,9 +655,16 @@ protected static boolean accepts(Object obj) {
     @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class HashNode extends PythonUnaryBuiltinNode {
         @Specialization
-        static long hashDouble(double self) {
+        static long doDouble(double self) {
             return PyObjectHashNode.hash(self);
         }
+
+        @Specialization(guards = "dval != null")
+        static long doNativeFloat(@SuppressWarnings("unused") VirtualFrame frame, @SuppressWarnings("unused") PythonNativeObject object,
+                        @SuppressWarnings("unused") @Cached FromNativeSubclassNode getFloat,
+                        @Bind("getFloat.execute(frame, object)") Double dval) {
+            return PyObjectHashNode.hash(dval);
+        }
     }
 
     @Builtin(name = "fromhex", minNumOfPositionalArgs = 2, isClassmethod = true)