[mypyc] translate call_emit primitive ops to CallC (#9012)

Related issue: mypyc/mypyc#734

This PR translates PrimitiveOps with call_emit, which can be represented by 
CallC pretty straightforwardly, to CallC. Mostly translating the description.

After this PR and another following PR which handles the ones whose 
descriptions are explicitly used in irbuild, we'll able to see what's missing for 
CallC by analyzing the remaining primitives.

Author: TH3CHARLie

mypyc/primitives/dict_ops.py

@@ -11,7 +11,7 @@
 from mypyc.primitives.registry import (
     name_ref_op, method_op, binary_op, func_op, custom_op,
     simple_emit, negative_int_emit, call_emit, call_negative_bool_emit,
-    name_emit, c_custom_op
+    name_emit, c_custom_op, c_method_op
 )
 
 
@@ -73,12 +73,12 @@
     emit=call_negative_bool_emit('CPyDict_UpdateFromAny'))
 
 # dict.get(key, default)
-method_op(
+c_method_op(
     name='get',
     arg_types=[dict_rprimitive, object_rprimitive, object_rprimitive],
-    result_type=object_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('CPyDict_Get'))
+    return_type=object_rprimitive,
+    c_function_name='CPyDict_Get',
+    error_kind=ERR_MAGIC)
 
 # dict.get(key)
 method_op(
@@ -115,6 +115,7 @@
     priority=2)
 
 # Generic one-argument dict constructor: dict(obj)
+
 func_op(
     name='builtins.dict',
     arg_types=[object_rprimitive],
@@ -123,31 +124,28 @@
     emit=call_emit('CPyDict_FromAny'))
 
 # dict.keys()
-method_op(
+c_method_op(
     name='keys',
     arg_types=[dict_rprimitive],
-    result_type=object_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('CPyDict_KeysView')
-)
+    return_type=object_rprimitive,
+    c_function_name='CPyDict_KeysView',
+    error_kind=ERR_MAGIC)
 
 # dict.values()
-method_op(
+c_method_op(
     name='values',
     arg_types=[dict_rprimitive],
-    result_type=object_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('CPyDict_ValuesView')
-)
+    return_type=object_rprimitive,
+    c_function_name='CPyDict_ValuesView',
+    error_kind=ERR_MAGIC)
 
 # dict.items()
-method_op(
+c_method_op(
     name='items',
     arg_types=[dict_rprimitive],
-    result_type=object_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('CPyDict_ItemsView')
-)
+    return_type=object_rprimitive,
+    c_function_name='CPyDict_ItemsView',
+    error_kind=ERR_MAGIC)
 
 # list(dict.keys())
 dict_keys_op = custom_op(

mypyc/primitives/int_ops.py

@@ -12,8 +12,8 @@
     str_rprimitive, RType
 )
 from mypyc.primitives.registry import (
-    name_ref_op, binary_op, func_op, custom_op,
-    simple_emit, call_emit, name_emit, c_unary_op, CFunctionDescription
+    name_ref_op, binary_op, custom_op, simple_emit, call_emit, name_emit,
+    c_unary_op, CFunctionDescription, c_function_op
 )
 
 # These int constructors produce object_rprimitives that then need to be unboxed
@@ -28,47 +28,46 @@
             is_borrowed=True)
 
 # Convert from a float to int. We could do a bit better directly.
-func_op(
+c_function_op(
     name='builtins.int',
     arg_types=[float_rprimitive],
-    result_type=object_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('CPyLong_FromFloat'),
-    priority=1)
+    return_type=object_rprimitive,
+    c_function_name='CPyLong_FromFloat',
+    error_kind=ERR_MAGIC)
 
 # int(string)
-func_op(
+c_function_op(
     name='builtins.int',
     arg_types=[str_rprimitive],
-    result_type=object_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('CPyLong_FromStr'),
-    priority=1)
+    return_type=object_rprimitive,
+    c_function_name='CPyLong_FromStr',
+    error_kind=ERR_MAGIC)
 
 # int(string, base)
-func_op(
+c_function_op(
     name='builtins.int',
     arg_types=[str_rprimitive, int_rprimitive],
-    result_type=object_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('CPyLong_FromStrWithBase'),
-    priority=1)
+    return_type=object_rprimitive,
+    c_function_name='CPyLong_FromStrWithBase',
+    error_kind=ERR_MAGIC)
 
 # str(n) on ints
-func_op(name='builtins.str',
-        arg_types=[int_rprimitive],
-        result_type=str_rprimitive,
-        error_kind=ERR_MAGIC,
-        emit=call_emit('CPyTagged_Str'),
-        priority=2)
+c_function_op(
+    name='builtins.str',
+    arg_types=[int_rprimitive],
+    return_type=str_rprimitive,
+    c_function_name='CPyTagged_Str',
+    error_kind=ERR_MAGIC,
+    priority=2)
 
 # We need a specialization for str on bools also since the int one is wrong...
-func_op(name='builtins.str',
-        arg_types=[bool_rprimitive],
-        result_type=str_rprimitive,
-        error_kind=ERR_MAGIC,
-        emit=call_emit('CPyBool_Str'),
-        priority=3)
+c_function_op(
+    name='builtins.str',
+    arg_types=[bool_rprimitive],
+    return_type=str_rprimitive,
+    c_function_name='CPyBool_Str',
+    error_kind=ERR_MAGIC,
+    priority=3)
 
 
 def int_binary_op(op: str, c_func_name: str,

mypyc/primitives/list_ops.py

@@ -8,7 +8,7 @@
 )
 from mypyc.primitives.registry import (
     name_ref_op, func_op, method_op, custom_op, name_emit,
-    call_emit, call_negative_bool_emit, c_function_op, c_binary_op
+    call_emit, call_negative_bool_emit, c_function_op, c_binary_op, c_method_op
 )
 
 
@@ -117,19 +117,20 @@ def emit_new(emitter: EmitterInterface, args: List[str], dest: str) -> None:
     emit=call_emit('CPyList_Pop'))
 
 # list.count(obj)
-method_op(
+c_method_op(
     name='count',
     arg_types=[list_rprimitive, object_rprimitive],
-    result_type=short_int_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('CPyList_Count'))
+    return_type=short_int_rprimitive,
+    c_function_name='CPyList_Count',
+    error_kind=ERR_MAGIC)
 
 # list * int
-c_binary_op(name='*',
-            arg_types=[list_rprimitive, int_rprimitive],
-            return_type=list_rprimitive,
-            c_function_name='CPySequence_Multiply',
-            error_kind=ERR_MAGIC)
+c_binary_op(
+    name='*',
+    arg_types=[list_rprimitive, int_rprimitive],
+    return_type=list_rprimitive,
+    c_function_name='CPySequence_Multiply',
+    error_kind=ERR_MAGIC)
 
 # int * list
 c_binary_op(name='*',

mypyc/primitives/misc_ops.py

@@ -7,7 +7,7 @@
 )
 from mypyc.primitives.registry import (
     name_ref_op, simple_emit, unary_op, func_op, custom_op, call_emit, name_emit,
-    call_negative_magic_emit
+    call_negative_magic_emit, c_function_op
 )
 
 
@@ -53,11 +53,12 @@
                                  is_borrowed=True)
 
 # id(obj)
-func_op(name='builtins.id',
-        arg_types=[object_rprimitive],
-        result_type=int_rprimitive,
-        error_kind=ERR_NEVER,
-        emit=call_emit('CPyTagged_Id'))
+c_function_op(
+    name='builtins.id',
+    arg_types=[object_rprimitive],
+    return_type=int_rprimitive,
+    c_function_name='CPyTagged_Id',
+    error_kind=ERR_NEVER)
 
 # Return the result of obj.__await()__ or obj.__iter__() (if no __await__ exists)
 coro_op = custom_op(name='get_coroutine_obj',

mypyc/primitives/set_ops.py

@@ -1,8 +1,8 @@
 """Primitive set (and frozenset) ops."""
 
 from mypyc.primitives.registry import (
-    func_op, method_op, binary_op,
-    simple_emit, negative_int_emit, call_emit, call_negative_bool_emit,
+    func_op, method_op, binary_op, simple_emit, negative_int_emit,
+    call_negative_bool_emit, c_function_op, c_method_op
 )
 from mypyc.ir.ops import ERR_MAGIC, ERR_FALSE, ERR_NEVER, EmitterInterface
 from mypyc.ir.rtypes import object_rprimitive, bool_rprimitive, set_rprimitive, int_rprimitive
@@ -19,22 +19,20 @@
 )
 
 # set(obj)
-func_op(
+c_function_op(
     name='builtins.set',
     arg_types=[object_rprimitive],
-    result_type=set_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('PySet_New')
-)
+    return_type=set_rprimitive,
+    c_function_name='PySet_New',
+    error_kind=ERR_MAGIC)
 
 # frozenset(obj)
-func_op(
+c_function_op(
     name='builtins.frozenset',
     arg_types=[object_rprimitive],
-    result_type=object_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('PyFrozenSet_New')
-)
+    return_type=object_rprimitive,
+    c_function_name='PyFrozenSet_New',
+    error_kind=ERR_MAGIC)
 
 
 def emit_len(emitter: EmitterInterface, args: List[str], dest: str) -> None:
@@ -64,13 +62,12 @@ def emit_len(emitter: EmitterInterface, args: List[str], dest: str) -> None:
 )
 
 # set.remove(obj)
-method_op(
+c_method_op(
     name='remove',
     arg_types=[set_rprimitive, object_rprimitive],
-    result_type=bool_rprimitive,
-    error_kind=ERR_FALSE,
-    emit=call_emit('CPySet_Remove')
-)
+    return_type=bool_rprimitive,
+    c_function_name='CPySet_Remove',
+    error_kind=ERR_FALSE)
 
 # set.discard(obj)
 method_op(
@@ -111,10 +108,9 @@ def emit_len(emitter: EmitterInterface, args: List[str], dest: str) -> None:
 )
 
 # set.pop()
-method_op(
+c_method_op(
     name='pop',
     arg_types=[set_rprimitive],
-    result_type=object_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('PySet_Pop')
-)
+    return_type=object_rprimitive,
+    c_function_name='PySet_Pop',
+    error_kind=ERR_MAGIC)

mypyc/primitives/str_ops.py

@@ -7,8 +7,8 @@
     RType, object_rprimitive, str_rprimitive, bool_rprimitive, int_rprimitive, list_rprimitive
 )
 from mypyc.primitives.registry import (
-    func_op, binary_op, simple_emit, name_ref_op, method_op, call_emit, name_emit,
-    c_method_op, c_binary_op
+    binary_op, simple_emit, name_ref_op, method_op, call_emit, name_emit,
+    c_method_op, c_binary_op, c_function_op
 )
 
 
@@ -20,18 +20,19 @@
             is_borrowed=True)
 
 # str(obj)
-func_op(name='builtins.str',
-        arg_types=[object_rprimitive],
-        result_type=str_rprimitive,
-        error_kind=ERR_MAGIC,
-        emit=call_emit('PyObject_Str'))
+c_function_op(
+    name='builtins.str',
+    arg_types=[object_rprimitive],
+    return_type=str_rprimitive,
+    c_function_name='PyObject_Str',
+    error_kind=ERR_MAGIC)
 
 # str1 + str2
-binary_op(op='+',
-          arg_types=[str_rprimitive, str_rprimitive],
-          result_type=str_rprimitive,
-          error_kind=ERR_MAGIC,
-          emit=call_emit('PyUnicode_Concat'))
+c_binary_op(name='+',
+            arg_types=[str_rprimitive, str_rprimitive],
+            return_type=str_rprimitive,
+            c_function_name='PyUnicode_Concat',
+            error_kind=ERR_MAGIC)
 
 # str.join(obj)
 c_method_op(
@@ -43,12 +44,13 @@
 )
 
 # str[index] (for an int index)
-method_op(
+c_method_op(
     name='__getitem__',
     arg_types=[str_rprimitive, int_rprimitive],
-    result_type=str_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=call_emit('CPyStr_GetItem'))
+    return_type=str_rprimitive,
+    c_function_name='CPyStr_GetItem',
+    error_kind=ERR_MAGIC
+)
 
 # str.split(...)
 str_split_types = [str_rprimitive, str_rprimitive, int_rprimitive]  # type: List[RType]

mypyc/test-data/analysis.test

@@ -525,7 +525,7 @@ def lol(x):
     r11, r12 :: int
 L0:
 L1:
-    r0 = id x :: object
+    r0 = CPyTagged_Id(x)
     st = r0
     goto L10
 L2: