simplify code for directly calling module internal tp_new() slot function

Cython/Compiler/Optimize.py

@@ -2153,21 +2153,6 @@ class OptimizeBuiltinCalls(Visitor.MethodDispatcherTransform):
             PyrexTypes.CFuncTypeArg("kwargs", Builtin.dict_type, None),
         ])
 
-    Pyx_call_tp_new_func_type = PyrexTypes.CFuncType(
-        PyrexTypes.py_object_type, [
-            PyrexTypes.CFuncTypeArg("tpnew_func", PyrexTypes.c_void_ptr_type, None),
-            PyrexTypes.CFuncTypeArg("type",   PyrexTypes.py_object_type, None),
-            PyrexTypes.CFuncTypeArg("args",   Builtin.tuple_type, None),
-            ])
-
-    Pyx_call_tp_new_kwargs_func_type = PyrexTypes.CFuncType(
-        PyrexTypes.py_object_type, [
-            PyrexTypes.CFuncTypeArg("tpnew_func", PyrexTypes.c_void_ptr_type, None),
-            PyrexTypes.CFuncTypeArg("type",   PyrexTypes.py_object_type, None),
-            PyrexTypes.CFuncTypeArg("args",   Builtin.tuple_type, None),
-            PyrexTypes.CFuncTypeArg("kwargs", Builtin.dict_type, None),
-            ])
-
     def _handle_any_slot__new__(self, node, args, is_unbound_method, kwargs=None):
         """Replace 'exttype.__new__(exttype, ...)' by a call to exttype->tp_new()
         """
@@ -2197,29 +2182,25 @@ class OptimizeBuiltinCalls(Visitor.MethodDispatcherTransform):
         if type_arg.type_entry:
             ext_type = type_arg.type_entry.type
             if ext_type.is_extension_type and not ext_type.is_external:
-                utility_code = UtilityCode.load_cached(
-                    'call_tp_new', 'ObjectHandling.c')
-                slot_func_cname = ext_type.scope.mangle_internal("tp_new")
-                slot_func = ExprNodes.RawCNameExprNode(
-                    node.pos, cname=slot_func_cname,
-                    type=PyrexTypes.c_void_ptr_type)
+                cython_scope = self.context.cython_scope
+                PyTypeObjectPtr = PyrexTypes.CPtrType(
+                    cython_scope.lookup('PyTypeObject').type)
+                pyx_tp_new_kwargs_func_type = PyrexTypes.CFuncType(
+                    PyrexTypes.py_object_type, [
+                        PyrexTypes.CFuncTypeArg("type",   PyTypeObjectPtr, None),
+                        PyrexTypes.CFuncTypeArg("args",   PyrexTypes.py_object_type, None),
+                        PyrexTypes.CFuncTypeArg("kwargs", PyrexTypes.py_object_type, None),
+                        ])
 
-                if kwargs:
-                    return ExprNodes.PythonCapiCallNode(
-                        node.pos, "__Pyx_call_tp_new_kwargs",
-                        self.Pyx_call_tp_new_kwargs_func_type,
-                        args=[slot_func, type_arg, args_tuple, kwargs],
-                        utility_code=utility_code,
-                        is_temp=node.is_temp
-                    )
-                else:
-                    return ExprNodes.PythonCapiCallNode(
-                        node.pos, "__Pyx_call_tp_new",
-                        self.Pyx_call_tp_new_func_type,
-                        args=[slot_func, type_arg, args_tuple],
-                        utility_code=utility_code,
-                        is_temp=node.is_temp
-                    )
+                type_arg = ExprNodes.CastNode(type_arg, PyTypeObjectPtr)
+                slot_func_cname = ext_type.scope.mangle_internal("tp_new")
+                if not kwargs:
+                    kwargs = ExprNodes.NullNode(node.pos, type=PyrexTypes.py_object_type)  # hack?
+                return ExprNodes.PythonCapiCallNode(
+                    node.pos, slot_func_cname,
+                    pyx_tp_new_kwargs_func_type,
+                    args=[type_arg, args_tuple, kwargs],
+                    is_temp=True)
         else:
             # arbitrary variable, needs a None check for safety
             type_arg = type_arg.as_none_safe_node(

Cython/Utility/ObjectHandling.c

@@ -658,9 +658,3 @@ bad:
 static CYTHON_INLINE PyObject* __Pyx_tp_new_kwargs(PyObject* type_obj, PyObject* args, PyObject* kwargs) {
     return (PyObject*) (((PyTypeObject*)type_obj)->tp_new((PyTypeObject*)type_obj, args, kwargs));
 }
-
-
-/////////////// call_tp_new.proto ///////////////
-
-#define __Pyx_call_tp_new(tp_new_func, type_obj, args) __Pyx_call_tp_new_kwargs(tp_new_func, type_obj, args, NULL)
-#define __Pyx_call_tp_new_kwargs(tp_new_func, type_obj, args, kwargs) tp_new_func((PyTypeObject*)type_obj, args, kwargs)