Remove MakeFunctionToJitFunction pass, which implicitly uses njit, not a use case we intend to support

Author: atmnp

numba_cuda/numba/cuda/compiler.py

@@ -48,7 +48,6 @@
     WithLifting,
     InlineInlinables,
     FindLiterallyCalls,
-    MakeFunctionToJitFunction,
     LiteralUnroll,
     ReconstructSSA,
     RewriteDynamicRaises,
@@ -225,11 +224,6 @@ def define_untyped_pipeline(state, name="untyped"):
 
         pm.add_pass(RewriteDynamicRaises, "rewrite dynamic raises")
 
-        # convert any remaining closures into functions
-        pm.add_pass(
-            MakeFunctionToJitFunction,
-            "convert make_function into JIT functions",
-        )
         # inline functions that have been determined as inlinable and rerun
         # branch pruning, this needs to be run after closures are inlined as
         # the IR repr of a closure masks call sites if an inlinable is called

numba_cuda/numba/cuda/core/untyped_passes.py

@@ -35,7 +35,6 @@
     resolve_func_from_module,
     simplify_CFG,
     GuardException,
-    convert_code_obj_to_function,
     build_definitions,
     replace_var_names,
     get_name_var_table,
@@ -618,72 +617,6 @@ def run_pass(self, state):
         return False
 
 
-@register_pass(mutates_CFG=True, analysis_only=False)
-class MakeFunctionToJitFunction(FunctionPass):
-    """
-    This swaps an ir.Expr.op == "make_function" i.e. a closure, for a compiled
-    function containing the closure body and puts it in ir.Global. It's a 1:1
-    statement value swap. `make_function` is already untyped
-    """
-
-    _name = "make_function_op_code_to_jit_function"
-
-    def __init__(self):
-        FunctionPass.__init__(self)
-
-    def run_pass(self, state):
-        from numba import njit
-
-        func_ir = state.func_ir
-        mutated = False
-        for idx, blk in func_ir.blocks.items():
-            for stmt in blk.body:
-                if isinstance(stmt, ir.Assign):
-                    if isinstance(stmt.value, ir.Expr):
-                        if stmt.value.op == "make_function":
-                            node = stmt.value
-                            getdef = func_ir.get_definition
-                            kw_default = getdef(node.defaults)
-                            ok = False
-                            if kw_default is None or isinstance(
-                                kw_default, ir.Const
-                            ):
-                                ok = True
-                            elif isinstance(kw_default, tuple):
-                                ok = all(
-                                    [
-                                        isinstance(getdef(x), ir.Const)
-                                        for x in kw_default
-                                    ]
-                                )
-                            elif isinstance(kw_default, ir.Expr):
-                                if kw_default.op != "build_tuple":
-                                    continue
-                                ok = all(
-                                    [
-                                        isinstance(getdef(x), ir.Const)
-                                        for x in kw_default.items
-                                    ]
-                                )
-                            if not ok:
-                                continue
-
-                            pyfunc = convert_code_obj_to_function(node, func_ir)
-                            func = njit()(pyfunc)
-                            new_node = ir.Global(
-                                node.code.co_name, func, stmt.loc
-                            )
-                            stmt.value = new_node
-                            mutated |= True
-
-        # if a change was made the del ordering is probably wrong, patch up
-        if mutated:
-            post_proc = postproc.PostProcessor(func_ir)
-            post_proc.run()
-
-        return mutated
-
-
 @register_pass(mutates_CFG=True, analysis_only=False)
 class TransformLiteralUnrollConstListToTuple(FunctionPass):
     """This pass spots a `literal_unroll([<constant values>])` and rewrites it