Support native subclass in ComplexBuiltins.HashNode

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -432,6 +432,12 @@ PyAPI_FUNC(RESULT) get_##NAME(RECEIVER obj) {                      \
 PyAPI_FUNC(RESULT) get_##NAME(RECEIVER obj) {                    \
     return obj->FIELD? obj->FIELD->NAME : NULL;                   \
 }
+
+#define PRIMITIVE_EMBEDDED_FIELD_GETTER(RECEIVER, FIELD, RESULT, NAME) \
+PyAPI_FUNC(RESULT) get_##FIELD##_##NAME(RECEIVER obj) { \
+    return obj->FIELD.NAME; \
+}
+
 TYPE_FIELD_GETTER(PyObject*, ob_type)
 PRIMITIVE_FIELD_GETTER(PyObject*, Py_ssize_t, ob_refcnt)
 PRIMITIVE_FIELD_GETTER(PyVarObject*, Py_ssize_t, ob_size)
@@ -514,6 +520,8 @@ PRIMITIVE_FIELD_GETTER(PyTypeObject*, unsigned long, tp_flags)
 PRIMITIVE_FIELD_GETTER(PyModuleDef_Base*, Py_ssize_t, m_index)
 PRIMITIVE_FIELD_GETTER(PyModuleDef*, Py_ssize_t, m_size)
 PRIMITIVE_FIELD_GETTER(PyModuleDef*, const char*, m_doc)
+PRIMITIVE_EMBEDDED_FIELD_GETTER(PyComplexObject*, cval, double, real)
+PRIMITIVE_EMBEDDED_FIELD_GETTER(PyComplexObject*, cval, double, imag)
 
 char* get_ob_sval(PyObject* op) {
 	return ((PyBytesObject *)(op))->ob_sval;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java

@@ -194,6 +194,8 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_GET_MP_LENGTH("get_mp_length"),
     FUN_GET_MP_SUBSCRIPT("get_mp_subscript"),
     FUN_GET_MP_ASS_SUBSCRIPT("get_mp_ass_subscript"),
+    FUN_GET_PY_COMPLEX_CVAL_REAL("get_cval_real"),
+    FUN_GET_PY_COMPLEX_CVAL_IMAG("get_cval_imag"),
     FUN_GET_PYMODULEDEF_M_METHODS("get_PyModuleDef_m_methods"),
     FUN_GET_PYMODULEDEF_M_SLOTS("get_PyModuleDef_m_slots"),
     FUN_GET_BYTE_ARRAY_TYPE_ID("get_byte_array_typeid"),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/complex/ComplexBuiltins.java

@@ -81,6 +81,10 @@
 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.cext.PythonAbstractNativeObject;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToSulongNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
 import com.oracle.graal.python.builtins.objects.common.FormatNodeBase;
 import com.oracle.graal.python.builtins.objects.complex.ComplexBuiltinsClinicProviders.FormatNodeClinicProviderGen;
 import com.oracle.graal.python.builtins.objects.floats.FloatBuiltins;
@@ -102,6 +106,7 @@
 import com.oracle.graal.python.runtime.formatting.InternalFormat;
 import com.oracle.graal.python.runtime.formatting.InternalFormat.Spec;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
+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;
@@ -112,6 +117,8 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -798,12 +805,43 @@ static double get(PComplex self) {
     @Builtin(name = J___HASH__, minNumOfPositionalArgs = 1)
     abstract static class HashNode extends PythonUnaryBuiltinNode {
         @Specialization
-        static long hash(PComplex self) {
+        static long doPComplex(PComplex self) {
+            return complexHash(self.getReal(), self.getImag());
+        }
+
+        @Specialization
+        static long doNative(PythonAbstractNativeObject self,
+                        @Cached ToSulongNode toSulongNode,
+                        @Cached PCallCapiFunction callGetRealNode,
+                        @Cached PCallCapiFunction callGetImagNode) {
+            Object ptr = toSulongNode.execute(self);
+            Object realObj = callGetRealNode.call(NativeCAPISymbol.FUN_GET_PY_COMPLEX_CVAL_REAL, ptr);
+            Object imagObj = callGetImagNode.call(NativeCAPISymbol.FUN_GET_PY_COMPLEX_CVAL_IMAG, ptr);
+            return complexHash(expectDouble(realObj), expectDouble(imagObj));
+        }
+
+        private static long complexHash(double real, double imag) {
             // just like CPython
-            long realHash = PyObjectHashNode.hash(self.getReal());
-            long imagHash = PyObjectHashNode.hash(self.getImag());
+            long realHash = PyObjectHashNode.hash(real);
+            long imagHash = PyObjectHashNode.hash(imag);
             return realHash + SysModuleBuiltins.HASH_IMAG * imagHash;
         }
+
+        private static double expectDouble(Object val) {
+            if (val instanceof Double) {
+                return (double) val;
+            }
+            InteropLibrary lib = InteropLibrary.getUncached(val);
+            if (lib.fitsInDouble(val)) {
+                try {
+                    return lib.asDouble(val);
+                } catch (UnsupportedMessageException e) {
+                    // fall through
+                }
+            }
+            throw CompilerDirectives.shouldNotReachHere();
+        }
+
     }
 
     @GenerateNodeFactory