Move dependency header includes to internal header

Author: p-sawicki

mypyc/codegen/emitmodule.py

@@ -638,27 +638,29 @@ def generate_c_for_modules(self) -> list[tuple[str, str]]:
         ext_declarations.emit_line(f"#define MYPYC_NATIVE{self.group_suffix}_H")
         ext_declarations.emit_line("#include <Python.h>")
         ext_declarations.emit_line("#include <CPy.h>")
+
+        declarations = Emitter(self.context)
+        declarations.emit_line(f"#ifndef MYPYC_LIBRT_INTERNAL{self.group_suffix}_H")
+        declarations.emit_line(f"#define MYPYC_LIBRT_INTERNAL{self.group_suffix}_H")
+        declarations.emit_line("#include <Python.h>")
+        declarations.emit_line("#include <CPy.h>")
+
         if self.compiler_options.depends_on_librt_internal:
-            ext_declarations.emit_line("#include <internal/librt_internal.h>")
+            declarations.emit_line("#include <internal/librt_internal.h>")
         if any(LIBRT_BASE64 in mod.dependencies for mod in self.modules.values()):
-            ext_declarations.emit_line("#include <base64/librt_base64.h>")
+            declarations.emit_line("#include <base64/librt_base64.h>")
         if any(LIBRT_STRINGS in mod.dependencies for mod in self.modules.values()):
-            ext_declarations.emit_line("#include <strings/librt_strings.h>")
+            declarations.emit_line("#include <strings/librt_strings.h>")
         if any(LIBRT_TIME in mod.dependencies for mod in self.modules.values()):
-            ext_declarations.emit_line("#include <time/librt_time.h>")
+            declarations.emit_line("#include <time/librt_time.h>")
         if any(LIBRT_VECS in mod.dependencies for mod in self.modules.values()):
-            ext_declarations.emit_line("#include <vecs/librt_vecs.h>")
+            declarations.emit_line("#include <vecs/librt_vecs.h>")
         # Include headers for conditional source files
         source_deps = collect_source_dependencies(self.modules)
         for source_dep in sorted(source_deps, key=lambda d: d.path):
             if header := source_dep.get_header():
-                ext_declarations.emit_line(f'#include "{header}"')
+                declarations.emit_line(f'#include "{header}"')
 
-        declarations = Emitter(self.context)
-        declarations.emit_line(f"#ifndef MYPYC_LIBRT_INTERNAL{self.group_suffix}_H")
-        declarations.emit_line(f"#define MYPYC_LIBRT_INTERNAL{self.group_suffix}_H")
-        declarations.emit_line("#include <Python.h>")
-        declarations.emit_line("#include <CPy.h>")
         declarations.emit_line(f'#include "__native{self.short_group_suffix}.h"')
         declarations.emit_line()
         declarations.emit_line("int CPyGlobalsInit(void);")

mypyc/test-data/run-multimodule.test

@@ -1410,3 +1410,55 @@ from other import test
 
 input = b'x' * 512
 assert test(input) == input
+
+[case testLibrtDependencyInImportedFile_experimental_librt]
+# Test that a compiled file (other.py) that does not depend on librt can import another compiled
+# file (native.py) that does. In separate compilation mode, the C extension for other.py includes
+# a header file with C definitions for the imported objects from native.py but the other.py C
+# extension does not include the header for the librt module. So this makes sure that the included
+# C definitions are generic (PyObjects instead of actual librt types) and don't "leak" the
+# dependency.
+from librt.strings import BytesWriter, write_i16_le
+
+glob = BytesWriter()
+
+def fn_returns_librt_type(b: bytes) -> BytesWriter:
+    w = BytesWriter()
+    w.write(b)
+    return w
+
+class ClassWithLibrtTypeMember:
+    def __init__(self, w: BytesWriter) -> None:
+        self.writer = w
+
+    def method_returns_librt_type(self) -> BytesWriter:
+        return self.writer
+
+[file other.py]
+import struct
+
+from native import glob, fn_returns_librt_type, ClassWithLibrtTypeMember, write_i16_le
+
+def test_global(b: bytes) -> None:
+    glob.write(b)
+    assert glob.getvalue() == b
+
+def test_fn(b: bytes) -> None:
+    assert fn_returns_librt_type(b).getvalue() == b
+
+def test_class(b: bytes) -> None:
+    c = ClassWithLibrtTypeMember(glob)
+    assert c.method_returns_librt_type().getvalue() == b
+
+def test_reexport() -> None:
+    write_i16_le(glob, 42)
+    assert glob.getvalue()[-2:] == struct.pack("<h", 42)
+
+[file driver.py]
+from other import test_global, test_fn, test_class, test_reexport
+
+input = b'x' * 512
+test_global(input)
+test_fn(input)
+test_class(input)
+test_reexport()