Remove remaining legacy function ops

Author: JukkaL

mypyc/irbuild/builder.py

@@ -134,7 +134,7 @@
 from mypyc.primitives.generic_ops import iter_op, next_op, py_setattr_op
 from mypyc.primitives.list_ops import list_get_item_unsafe_op, list_pop_last, to_list
 from mypyc.primitives.misc_ops import check_unpack_count_op, get_module_dict_op, import_op
-from mypyc.primitives.registry import CFunctionDescription, function_ops, legacy_function_ops
+from mypyc.primitives.registry import CFunctionDescription, function_ops
 
 # These int binary operations can borrow their operands safely, since the
 # primitives take this into consideration.
@@ -1051,12 +1051,6 @@ def call_refexpr_with_args(
         # Handle data-driven special-cased primitive call ops.
         if callee.fullname and expr.arg_kinds == [ARG_POS] * len(arg_values):
             fullname = get_call_target_fullname(callee)
-            call_c_ops_candidates = legacy_function_ops.get(fullname, [])
-            target = self.builder.matching_call_c(
-                call_c_ops_candidates, arg_values, expr.line, self.node_type(expr)
-            )
-            if target:
-                return target
             primitive_candidates = function_ops.get(fullname, [])
             target = self.builder.matching_primitive_op(
                 primitive_candidates, arg_values, expr.line, self.node_type(expr)

mypyc/primitives/bytes_ops.py

@@ -18,7 +18,7 @@
     ERR_NEG_INT,
     binary_op,
     custom_op,
-    legacy_function_op,
+    function_op,
     load_address_op,
     method_op,
 )
@@ -27,7 +27,7 @@
 load_address_op(name="builtins.bytes", type=object_rprimitive, src="PyBytes_Type")
 
 # bytes(obj)
-legacy_function_op(
+function_op(
     name="builtins.bytes",
     arg_types=[RUnion([list_rprimitive, dict_rprimitive, str_rprimitive])],
     return_type=bytes_rprimitive,
@@ -36,7 +36,7 @@
 )
 
 # bytearray(obj)
-legacy_function_op(
+function_op(
     name="builtins.bytearray",
     arg_types=[object_rprimitive],
     return_type=bytes_rprimitive,

mypyc/primitives/dict_ops.py

@@ -19,7 +19,7 @@
     ERR_NEG_INT,
     binary_op,
     custom_op,
-    legacy_function_op,
+    function_op,
     load_address_op,
     method_op,
 )
@@ -28,7 +28,7 @@
 load_address_op(name="builtins.dict", type=object_rprimitive, src="PyDict_Type")
 
 # Construct an empty dictionary via dict().
-legacy_function_op(
+function_op(
     name="builtins.dict",
     arg_types=[],
     return_type=dict_rprimitive,
@@ -53,7 +53,7 @@
 )
 
 # Construct a dictionary from another dictionary.
-legacy_function_op(
+function_op(
     name="builtins.dict",
     arg_types=[dict_rprimitive],
     return_type=dict_rprimitive,
@@ -63,7 +63,7 @@
 )
 
 # Generic one-argument dict constructor: dict(obj)
-dict_copy = legacy_function_op(
+dict_copy = function_op(
     name="builtins.dict",
     arg_types=[object_rprimitive],
     return_type=dict_rprimitive,

mypyc/primitives/list_ops.py

@@ -20,7 +20,6 @@
     custom_op,
     custom_primitive_op,
     function_op,
-    legacy_function_op,
     load_address_op,
     method_op,
 )
@@ -38,7 +37,7 @@
 )
 
 # Construct an empty list via list().
-legacy_function_op(
+function_op(
     name="builtins.list",
     arg_types=[],
     return_type=list_rprimitive,

mypyc/primitives/misc_ops.py

@@ -21,7 +21,7 @@
     ERR_NEG_INT,
     custom_op,
     custom_primitive_op,
-    legacy_function_op,
+    function_op,
     load_address_op,
 )
 
@@ -48,7 +48,7 @@
 )
 
 # id(obj)
-legacy_function_op(
+function_op(
     name="builtins.id",
     arg_types=[object_rprimitive],
     return_type=int_rprimitive,
@@ -161,7 +161,7 @@
 )
 
 # isinstance(obj, cls)
-slow_isinstance_op = legacy_function_op(
+slow_isinstance_op = function_op(
     name="builtins.isinstance",
     arg_types=[object_rprimitive, object_rprimitive],
     return_type=c_int_rprimitive,
@@ -172,7 +172,7 @@
 
 # Faster isinstance(obj, cls) that only works with native classes and doesn't perform
 # type checking of the type argument.
-fast_isinstance_op = legacy_function_op(
+fast_isinstance_op = function_op(
     "builtins.isinstance",
     arg_types=[object_rprimitive, object_rprimitive],
     return_type=bool_rprimitive,
@@ -182,7 +182,7 @@
 )
 
 # bool(obj) with unboxed result
-bool_op = legacy_function_op(
+bool_op = function_op(
     name="builtins.bool",
     arg_types=[object_rprimitive],
     return_type=c_int_rprimitive,
@@ -192,7 +192,7 @@
 )
 
 # slice(start, stop, step)
-new_slice_op = legacy_function_op(
+new_slice_op = function_op(
     name="builtins.slice",
     arg_types=[object_rprimitive, object_rprimitive, object_rprimitive],
     c_function_name="PySlice_New",
@@ -201,7 +201,7 @@
 )
 
 # type(obj)
-type_op = legacy_function_op(
+type_op = function_op(
     name="builtins.type",
     arg_types=[object_rprimitive],
     c_function_name="PyObject_Type",

mypyc/primitives/registry.py

@@ -76,10 +76,7 @@ class LoadAddressDescription(NamedTuple):
 # Primitive ops for top level function call (such as 'builtins.list')
 function_ops: dict[str, list[PrimitiveDescription]] = {}
 
-# Legacy CallC ops for top level function call (such as 'builtins.list')
-legacy_function_ops: dict[str, list[CFunctionDescription]] = {}
-
-# CallC op for binary ops
+# Primitive ops for binary operations
 binary_ops: dict[str, list[PrimitiveDescription]] = {}
 
 # CallC op for unary ops
@@ -151,54 +148,6 @@ def method_op(
     return desc
 
 
-def legacy_function_op(
-    name: str,
-    arg_types: list[RType],
-    return_type: RType,
-    c_function_name: str,
-    error_kind: int,
-    var_arg_type: RType | None = None,
-    truncated_type: RType | None = None,
-    ordering: list[int] | None = None,
-    extra_int_constants: list[tuple[int, RType]] | None = None,
-    steals: StealsDescription = False,
-    is_borrowed: bool = False,
-    priority: int = 1,
-) -> CFunctionDescription:
-    """Define a C function call op that replaces a function call.
-
-    NOTE: Use function_op instead for new use cases.
-
-    This will be automatically generated by matching against the AST.
-
-    Most arguments are similar to method_op().
-
-    Args:
-        name: full name of the function
-        arg_types: positional argument types for which this applies
-    """
-    if extra_int_constants is None:
-        extra_int_constants = []
-    ops = legacy_function_ops.setdefault(name, [])
-    desc = CFunctionDescription(
-        name,
-        arg_types,
-        return_type,
-        var_arg_type,
-        truncated_type,
-        c_function_name,
-        error_kind,
-        steals,
-        is_borrowed,
-        ordering,
-        extra_int_constants,
-        priority,
-        is_pure=False,
-    )
-    ops.append(desc)
-    return desc
-
-
 def function_op(
     name: str,
     arg_types: list[RType],

mypyc/primitives/set_ops.py

@@ -14,7 +14,7 @@
 from mypyc.primitives.registry import (
     ERR_NEG_INT,
     binary_op,
-    legacy_function_op,
+    function_op,
     load_address_op,
     method_op,
 )
@@ -26,7 +26,7 @@
 load_address_op(name="builtins.frozenset", type=object_rprimitive, src="PyFrozenSet_Type")
 
 # Construct an empty set.
-new_set_op = legacy_function_op(
+new_set_op = function_op(
     name="builtins.set",
     arg_types=[],
     return_type=set_rprimitive,
@@ -36,7 +36,7 @@
 )
 
 # set(obj)
-legacy_function_op(
+function_op(
     name="builtins.set",
     arg_types=[object_rprimitive],
     return_type=set_rprimitive,
@@ -45,7 +45,7 @@
 )
 
 # frozenset(obj)
-legacy_function_op(
+function_op(
     name="builtins.frozenset",
     arg_types=[object_rprimitive],
     return_type=object_rprimitive,

mypyc/primitives/tuple_ops.py

@@ -15,7 +15,7 @@
     object_rprimitive,
     tuple_rprimitive,
 )
-from mypyc.primitives.registry import custom_op, legacy_function_op, load_address_op, method_op
+from mypyc.primitives.registry import custom_op, function_op, load_address_op, method_op
 
 # Get the 'builtins.tuple' type object.
 load_address_op(name="builtins.tuple", type=object_rprimitive, src="PyTuple_Type")
@@ -56,7 +56,7 @@
 )
 
 # Construct tuple from a list.
-list_tuple_op = legacy_function_op(
+list_tuple_op = function_op(
     name="builtins.tuple",
     arg_types=[list_rprimitive],
     return_type=tuple_rprimitive,
@@ -66,7 +66,7 @@
 )
 
 # Construct tuple from an arbitrary (iterable) object.
-legacy_function_op(
+function_op(
     name="builtins.tuple",
     arg_types=[object_rprimitive],
     return_type=tuple_rprimitive,

mypyc/test/test_cheader.py

@@ -26,11 +26,7 @@ def check_name(name: str) -> None:
                     rf"\b{name}\b", header
                 ), f'"{name}" is used in mypyc.primitives but not declared in CPy.h'
 
-        for old_values in [
-            registry.method_call_ops.values(),
-            registry.legacy_function_ops.values(),
-            registry.unary_ops.values(),
-        ]:
+        for old_values in [registry.method_call_ops.values(), registry.unary_ops.values()]:
             for old_ops in old_values:
                 if isinstance(old_ops, CFunctionDescription):
                     old_ops = [old_ops]