[mypyc] feat: PyObject_CallObject op for fn(*args)

Author: BobTheBuidler

mypyc/annotate.py

@@ -77,6 +77,7 @@ def __init__(self, message: str, priority: int = 1) -> None:
     "PyNumber_Rshift": Annotation('Generic ">>" operation.'),
     "PyNumber_Invert": Annotation('Generic "~" operation.'),
     "PyObject_Call": Annotation("Generic call operation."),
+    "PyObject_CallObject": Annotation("Generic call operation."),
     "PyObject_RichCompare": Annotation("Generic comparison operation."),
     "PyObject_GetItem": Annotation("Generic indexing operation."),
     "PyObject_SetItem": Annotation("Generic indexed assignment."),

mypyc/irbuild/ll_builder.py

@@ -138,6 +138,7 @@
     generic_ssize_t_len_op,
     py_call_op,
     py_call_with_kwargs_op,
+    py_call_with_posargs_op,
     py_getattr_op,
     py_method_call_op,
     py_vectorcall_method_op,
@@ -801,7 +802,7 @@ def _construct_varargs(
                             value = self.primitive_op(list_tuple_op, [value], line)
                         elif not is_tuple_rprimitive(value.type):
                             value = self.primitive_op(sequence_tuple_op, [value], line)
-                        return value, self._create_dict([], [], line)
+                        return value, None
                     elif len(args) == 2 and args[1][1] == ARG_STAR2:
                         # fn(*args, **kwargs)
                         if is_tuple_rprimitive(value.type):
@@ -939,13 +940,16 @@ def py_call(
         if arg_kinds is None or all(kind == ARG_POS for kind in arg_kinds):
             return self.call_c(py_call_op, [function] + arg_values, line)
 
-        # Otherwise fallback to py_call_with_kwargs_op.
+        # Otherwise fallback to py_call_with_posargs_op or py_call_with_kwargs_op.
         assert arg_names is not None
 
         pos_args_tuple, kw_args_dict = self._construct_varargs(
             list(zip(arg_values, arg_kinds, arg_names)), line, has_star=True, has_star2=True
         )
-        assert pos_args_tuple and kw_args_dict
+        assert pos_args_tuple
+        
+        if kw_args_dict is None:
+            return self.call_c(py_call_with_posargs_op, [function, pos_args_tuple], line)
 
         return self.call_c(py_call_with_kwargs_op, [function, pos_args_tuple, kw_args_dict], line)
 

mypyc/primitives/generic_ops.py

@@ -307,6 +307,15 @@
     error_kind=ERR_MAGIC,
 )
 
+# Call callable object with positional args only: func(*args)
+# Arguments are (func, *args tuple).
+py_call_with_posargs_op = custom_op(
+    arg_types=[object_rprimitive, object_rprimitive],
+    return_type=object_rprimitive,
+    c_function_name="PyObject_CallObject",
+    error_kind=ERR_MAGIC,
+)
+
 # Call method with positional arguments: obj.method(arg1, ...)
 # Arguments are (object, attribute name, arg1, ...).
 py_method_call_op = custom_op(

mypyc/test-data/irbuild-basic.test

@@ -1676,20 +1676,18 @@ def g():
     r2 :: str
     r3, r4 :: object
     r5 :: tuple
-    r6 :: dict
-    r7 :: object
-    r8 :: tuple[int, int, int]
+    r6 :: object
+    r7 :: tuple[int, int, int]
 L0:
     r0 = (2, 4, 6)
     r1 = __main__.globals :: static
     r2 = 'f'
     r3 = CPyDict_GetItem(r1, r2)
     r4 = box(tuple[int, int, int], r0)
     r5 = PySequence_Tuple(r4)
-    r6 = PyDict_New()
-    r7 = PyObject_Call(r3, r5, r6)
-    r8 = unbox(tuple[int, int, int], r7)
-    return r8
+    r6 = PyObject_CallObject(r3, r5)
+    r7 = unbox(tuple[int, int, int], r6)
+    return r7
 def h():
     r0 :: tuple[int, int]
     r1 :: dict
@@ -3568,15 +3566,12 @@ def wrapper_deco_obj.__call__(__mypyc_self__, args):
     __mypyc_self__ :: __main__.wrapper_deco_obj
     args :: tuple
     r0 :: __main__.deco_env
-    r1 :: object
-    r2 :: dict
-    r3 :: object
+    r1, r2 :: object
 L0:
     r0 = __mypyc_self__.__mypyc_env__
     r1 = r0.fn
-    r2 = PyDict_New()
-    r3 = PyObject_Call(r1, args, r2)
-    return r3
+    r2 = PyObject_CallObject(r1, args)
+    return r2
 def deco(fn):
     fn :: object
     r0 :: __main__.deco_env
@@ -3619,15 +3614,13 @@ def wrapper_deco_obj.__call__(__mypyc_self__, args):
     r0 :: __main__.deco_env
     r1 :: object
     r2 :: tuple
-    r3 :: dict
-    r4 :: object
+    r3 :: object
 L0:
     r0 = __mypyc_self__.__mypyc_env__
     r1 = r0.fn
     r2 = PyList_AsTuple(args)
-    r3 = PyDict_New()
-    r4 = PyObject_Call(r1, r2, r3)
-    return r4
+    r3 = PyObject_CallObject(r1, r2)
+    return r3
 def deco(fn):
     fn :: object
     r0 :: __main__.deco_env
@@ -3726,15 +3719,13 @@ def wrapper_deco_obj.__call__(__mypyc_self__, args):
     r0 :: __main__.deco_env
     r1 :: object
     r2 :: tuple
-    r3 :: dict
-    r4 :: object
+    r3 :: object
 L0:
     r0 = __mypyc_self__.__mypyc_env__
     r1 = r0.fn
     r2 = PySequence_Tuple(args)
-    r3 = PyDict_New()
-    r4 = PyObject_Call(r1, r2, r3)
-    return r4
+    r3 = PyObject_CallObject(r1, r2)
+    return r3
 def deco(fn):
     fn :: object
     r0 :: __main__.deco_env