Improve PyComplex_AsCComplex

Author: fangerer

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

@@ -324,18 +324,14 @@ PyComplex_AsCComplex(PyObject *op)
     // GraalPy change: different implementation
     /* If op is already of type PyComplex_Type, return its value */
     if (!points_to_py_handle_space(op) && PyComplex_Check(op)) {
-        return ((PyComplexObject *)op)->cval;
+        return ((PyComplexObject*) op)->cval;
     }
-	PyObject* parts = GraalPyTruffleComplex_AsCComplex(op);
-	Py_complex result;
-	if(parts != NULL) {
-		result.real = PyFloat_AsDouble(PyTuple_GetItem(parts, 0));
-		result.imag = PyFloat_AsDouble(PyTuple_GetItem(parts, 1));
-		Py_DecRef(parts);
-		return result;
-	}
-    Py_complex c_error = {-1., 0.};
-	return c_error;
+    Py_complex result;
+    if (GraalPyTruffleComplex_AsCComplex(op, &result) == 0) {
+        return result;
+    }
+    Py_complex c_error = { -1., 0. };
+    return c_error;
 }
 
 #if 0 // GraalPy change

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextComplexBuiltins.java

@@ -43,6 +43,8 @@
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
 import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Direct;
 import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Ignored;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Int;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Pointer;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObject;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectTransfer;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___FLOAT__;
@@ -55,8 +57,9 @@
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiUnaryBuiltinNode;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor;
+import com.oracle.graal.python.builtins.objects.cext.structs.CFields;
+import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
-import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.lib.PyObjectGetAttr;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.call.CallNode;
@@ -75,20 +78,24 @@
 
 public final class PythonCextComplexBuiltins {
 
-    @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Ignored)
-    abstract static class PyTruffleComplex_AsCComplex extends CApiUnaryBuiltinNode {
+    @CApiBuiltin(ret = Int, args = {PyObject, Pointer}, call = Ignored)
+    abstract static class PyTruffleComplex_AsCComplex extends CApiBinaryBuiltinNode {
         @Specialization
-        static PTuple asComplex(PComplex c,
-                        @Shared @Cached PythonObjectFactory factory) {
-            return factory.createTuple(new Object[]{c.getReal(), c.getImag()});
+        static int asComplex(PComplex c, Object out,
+                        @Shared @Cached CStructAccess.WriteDoubleNode writeDoubleNode) {
+            writeDoubleNode.write(out, CFields.Py_complex__real, c.getReal());
+            writeDoubleNode.write(out, CFields.Py_complex__imag, c.getImag());
+            return 0;
         }
 
         @Specialization(guards = "!isPComplex(obj)")
-        static Object asComplex(Object obj,
+        static int doGeneric(Object obj, Object out,
                         @Cached ComplexNode complexNode,
-                        @Shared @Cached PythonObjectFactory factory) {
+                        @Shared @Cached CStructAccess.WriteDoubleNode writeDoubleNode) {
             PComplex c = (PComplex) complexNode.execute(null, PythonBuiltinClassType.PComplex, obj, PNone.NO_VALUE);
-            return factory.createTuple(new Object[]{c.getReal(), c.getImag()});
+            writeDoubleNode.write(out, CFields.Py_complex__real, c.getReal());
+            writeDoubleNode.write(out, CFields.Py_complex__imag, c.getImag());
+            return 0;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/structs/CFields.java

@@ -304,6 +304,9 @@ public enum CFields {
 
     PyModuleDef_Base__m_index(Py_ssize_t),
 
+    Py_complex__real(Double),
+    Py_complex__imag(Double),
+
     PyComplexObject__cval__real(Double),
     PyComplexObject__cval__imag(Double),
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/structs/CStructs.java

@@ -74,6 +74,7 @@ public enum CStructs {
     GraalPyFloatObject,
     PyLongObject,
     PyModuleDef_Base,
+    Py_complex,
     PyComplexObject,
     PyDateTime_Date,
     PyDateTime_Time,