[mypyc] Merge generic call ops (#9316)

This PR merges three generic call ops.

Author: TH3CHARLie

mypyc/codegen/emitfunc.py

@@ -15,7 +15,8 @@
     BinaryIntOp, LoadMem, GetElementPtr, LoadAddress, ComparisonOp
 )
 from mypyc.ir.rtypes import (
-    RType, RTuple, is_tagged, is_int32_rprimitive, is_int64_rprimitive, RStruct
+    RType, RTuple, is_tagged, is_int32_rprimitive, is_int64_rprimitive, RStruct,
+    is_pointer_rprimitive
 )
 from mypyc.ir.func_ir import FuncIR, FuncDecl, FUNC_STATICMETHOD, FUNC_CLASSMETHOD
 from mypyc.ir.class_ir import ClassIR
@@ -498,7 +499,10 @@ def label(self, label: BasicBlock) -> str:
 
     def reg(self, reg: Value) -> str:
         if reg.name in self.const_int_regs:
-            return str(self.const_int_regs[reg.name])
+            val = self.const_int_regs[reg.name]
+            if val == 0 and is_pointer_rprimitive(reg.type):
+                return "NULL"
+            return str(val)
         else:
             return self.emitter.reg(reg)
 

mypyc/irbuild/ll_builder.py

@@ -241,7 +241,7 @@ def py_call(self,
         """
         # If all arguments are positional, we can use py_call_op.
         if (arg_kinds is None) or all(kind == ARG_POS for kind in arg_kinds):
-            return self.primitive_op(py_call_op, [function] + arg_values, line)
+            return self.call_c(py_call_op, [function] + arg_values, line)
 
         # Otherwise fallback to py_call_with_kwargs_op.
         assert arg_names is not None
@@ -278,7 +278,7 @@ def py_call(self,
 
         kw_args_dict = self.make_dict(kw_arg_key_value_pairs, line)
 
-        return self.primitive_op(
+        return self.call_c(
             py_call_with_kwargs_op, [function, pos_args_tuple, kw_args_dict], line)
 
     def py_method_call(self,
@@ -291,7 +291,7 @@ def py_method_call(self,
         """Call a Python method (non-native and slow)."""
         if (arg_kinds is None) or all(kind == ARG_POS for kind in arg_kinds):
             method_name_reg = self.load_static_unicode(method_name)
-            return self.primitive_op(py_method_call_op, [obj, method_name_reg] + arg_values, line)
+            return self.call_c(py_method_call_op, [obj, method_name_reg] + arg_values, line)
         else:
             method = self.py_get_attr(obj, method_name, line)
             return self.py_call(method, arg_values, line, arg_kinds=arg_kinds, arg_names=arg_names)

mypyc/primitives/generic_ops.py

@@ -10,10 +10,11 @@
 """
 
 from mypyc.ir.ops import ERR_NEVER, ERR_MAGIC, ERR_NEG_INT
-from mypyc.ir.rtypes import object_rprimitive, int_rprimitive, bool_rprimitive, c_int_rprimitive
+from mypyc.ir.rtypes import (
+    object_rprimitive, int_rprimitive, bool_rprimitive, c_int_rprimitive, pointer_rprimitive
+)
 from mypyc.primitives.registry import (
-    binary_op, custom_op, call_emit, simple_emit,
-    c_binary_op, c_unary_op, c_method_op, c_function_op, c_custom_op
+    binary_op, simple_emit, c_binary_op, c_unary_op, c_method_op, c_function_op, c_custom_op
 )
 
 
@@ -186,32 +187,31 @@
 
 # Call callable object with N positional arguments: func(arg1, ..., argN)
 # Arguments are (func, arg1, ..., argN).
-py_call_op = custom_op(
-    arg_types=[object_rprimitive],
-    result_type=object_rprimitive,
-    is_var_arg=True,
+py_call_op = c_custom_op(
+    arg_types=[],
+    return_type=object_rprimitive,
+    c_function_name='PyObject_CallFunctionObjArgs',
     error_kind=ERR_MAGIC,
-    format_str='{dest} = py_call({comma_args})',
-    emit=simple_emit('{dest} = PyObject_CallFunctionObjArgs({comma_args}, NULL);'))
+    var_arg_type=object_rprimitive,
+    extra_int_constant=(0, pointer_rprimitive))
 
 # Call callable object with positional + keyword args: func(*args, **kwargs)
 # Arguments are (func, *args tuple, **kwargs dict).
-py_call_with_kwargs_op = custom_op(
+py_call_with_kwargs_op = c_custom_op(
     arg_types=[object_rprimitive, object_rprimitive, object_rprimitive],
-    result_type=object_rprimitive,
-    error_kind=ERR_MAGIC,
-    format_str='{dest} = py_call_with_kwargs({args[0]}, {args[1]}, {args[2]})',
-    emit=call_emit('PyObject_Call'))
+    return_type=object_rprimitive,
+    c_function_name='PyObject_Call',
+    error_kind=ERR_MAGIC)
 
 # Call method with positional arguments: obj.method(arg1, ...)
 # Arguments are (object, attribute name, arg1, ...).
-py_method_call_op = custom_op(
-    arg_types=[object_rprimitive],
-    result_type=object_rprimitive,
-    is_var_arg=True,
+py_method_call_op = c_custom_op(
+    arg_types=[],
+    return_type=object_rprimitive,
+    c_function_name='CPyObject_CallMethodObjArgs',
     error_kind=ERR_MAGIC,
-    format_str='{dest} = py_method_call({comma_args})',
-    emit=simple_emit('{dest} = CPyObject_CallMethodObjArgs({comma_args}, NULL);'))
+    var_arg_type=object_rprimitive,
+    extra_int_constant=(0, pointer_rprimitive))
 
 # len(obj)
 generic_len_op = c_custom_op(

mypyc/test-data/exceptions.test

@@ -192,7 +192,7 @@ L1:
     r2 = CPyObject_GetAttr(r0, r1)
     if is_error(r2) goto L3 (error at g:3) else goto L2
 L2:
-    r3 = py_call(r2)
+    r3 = PyObject_CallFunctionObjArgs(r2, 0)
     dec_ref r2
     if is_error(r3) goto L3 (error at g:3) else goto L10
 L3:
@@ -203,7 +203,7 @@ L3:
     r8 = CPyObject_GetAttr(r6, r7)
     if is_error(r8) goto L6 (error at g:5) else goto L4
 L4:
-    r9 = py_call(r8, r5)
+    r9 = PyObject_CallFunctionObjArgs(r8, r5, 0)
     dec_ref r8
     if is_error(r9) goto L6 (error at g:5) else goto L11
 L5:
@@ -260,7 +260,7 @@ L1:
     r2 = CPyObject_GetAttr(r0, r1)
     if is_error(r2) goto L5 (error at a:3) else goto L2
 L2:
-    r3 = py_call(r2)
+    r3 = PyObject_CallFunctionObjArgs(r2, 0)
     dec_ref r2
     if is_error(r3) goto L5 (error at a:3) else goto L20
 L3:
@@ -283,7 +283,7 @@ L6:
     r14 = CPyObject_GetAttr(r12, r13)
     if is_error(r14) goto L13 (error at a:6) else goto L7
 L7:
-    r15 = py_call(r14, r11)
+    r15 = PyObject_CallFunctionObjArgs(r14, r11, 0)
     dec_ref r14
     if is_error(r15) goto L13 (error at a:6) else goto L21
 L8:
@@ -494,7 +494,7 @@ L5:
 L6:
     unreachable
 L7:
-    r7 = py_call(r6, v)
+    r7 = PyObject_CallFunctionObjArgs(r6, v, 0)
     dec_ref r6
     xdec_ref v
     if is_error(r7) goto L9 (error at f:7) else goto L14