Refactor

Author: JukkaL

mypyc/codegen/emitmodule.py

@@ -261,9 +261,9 @@ def compile_scc_to_ir(
             # Switch to lower abstraction level IR.
             lower_ir(fn, compiler_options)
             # Calculate implicit module dependencies (needed for librt)
-            capsule_deps = find_implicit_capsule_dependencies(fn)
-            if capsule_deps is not None:
-                module.implicit_imports.update(capsule_deps)
+            capsules = find_implicit_capsule_dependencies(fn)
+            if capsules is not None:
+                module.capsules.update(capsules)
             # Perform optimizations.
             do_copy_propagation(fn, compiler_options)
             do_flag_elimination(fn, compiler_options)
@@ -609,7 +609,7 @@ def generate_c_for_modules(self) -> list[tuple[str, str]]:
         ext_declarations.emit_line("#include <CPy.h>")
         if self.compiler_options.depends_on_librt_internal:
             ext_declarations.emit_line("#include <librt_internal.h>")
-        if any("librt.base64" in mod.implicit_imports for mod in self.modules.values()):
+        if any("librt.base64" in mod.capsules for mod in self.modules.values()):
             ext_declarations.emit_line("#include <librt_base64.h>")
 
         declarations = Emitter(self.context)
@@ -1041,7 +1041,7 @@ def emit_module_exec_func(
             emitter.emit_line("if (import_librt_internal() < 0) {")
             emitter.emit_line("return -1;")
             emitter.emit_line("}")
-        if "librt.base64" in module.implicit_imports:
+        if "librt.base64" in module.capsules:
             emitter.emit_line("if (import_librt_base64() < 0) {")
             emitter.emit_line("return -1;")
             emitter.emit_line("}")

mypyc/ir/module_ir.py

@@ -30,7 +30,8 @@ def __init__(
         # These are only visible in the module that defined them, so no need
         # to serialize.
         self.type_var_names = type_var_names
-        self.implicit_imports: set[str] = set()
+        # Capsules needed by the module, specified via module names such as "librt.base64"
+        self.capsules: set[str] = set()
 
     def serialize(self) -> JsonDict:
         return {
@@ -39,7 +40,7 @@ def serialize(self) -> JsonDict:
             "functions": [f.serialize() for f in self.functions],
             "classes": [c.serialize() for c in self.classes],
             "final_names": [(k, t.serialize()) for k, t in self.final_names],
-            "implicit_imports": list(self.implicit_imports),
+            "capsules": sorted(self.capsules),
         }
 
     @classmethod
@@ -52,7 +53,7 @@ def deserialize(cls, data: JsonDict, ctx: DeserMaps) -> ModuleIR:
             [(k, deserialize_type(t, ctx)) for k, t in data["final_names"]],
             [],
         )
-        module.implicit_imports = set(data["implicit_imports"])
+        module.capsules = set(data["capsules"])
         return module