WIP

Author: hnrklssn

include/swift/Subsystems.h

@@ -126,7 +126,7 @@ namespace swift {
   /// Resolve imports for a source file generated to adapt a given
   /// Clang module.
   void performImportResolutionForClangMacroBuffer(
-    SourceFile &SF, ModuleDecl *clangModule
+    SourceFile &SF, ModuleDecl *clangModule, const clang::Module *M
   );
 
   /// Once type-checking is complete, this instruments code with calls to an

lib/Sema/ImportResolution.cpp

@@ -320,7 +320,7 @@ void swift::performImportResolution(SourceFile &SF) {
 }
 
 void swift::performImportResolutionForClangMacroBuffer(
-    SourceFile &SF, ModuleDecl *clangModule
+    SourceFile &SF, ModuleDecl *clangModule, const clang::Module *M
 ) {
   // If we've already performed import resolution, bail.
   if (SF.ASTStage == SourceFile::ImportsResolved)
@@ -329,6 +329,21 @@ void swift::performImportResolutionForClangMacroBuffer(
   ImportResolver resolver(SF);
   resolver.addImplicitImport(clangModule);
 
+  ASTContext &ctx = clangModule->getASTContext();
+  auto *clangImporter = ctx.getClangModuleLoader();
+  llvm::dbgs() << "adding self from actual clang module:\n";
+  M->dump();
+  auto wrapper = clangImporter->getWrapperForModule(M);
+  wrapper->dump();
+  resolver.addImplicitImport(wrapper);
+  for (auto &I : M->Imports) {
+    llvm::dbgs() << "adding import from actual clang module:\n";
+    I->dump();
+    auto wrapper = clangImporter->getWrapperForModule(I);
+    wrapper->dump();
+    resolver.addImplicitImport(wrapper);
+  }
+
   // FIXME: This is a hack that we shouldn't need, but be sure that we can
   // see the Swift standard library.
   if (auto stdlib = SF.getASTContext().getStdlibModule())

lib/Sema/TypeCheckMacros.cpp

@@ -1062,7 +1062,9 @@ createMacroSourceFile(std::unique_ptr<llvm::MemoryBuffer> buffer,
   else if (auto clangModuleUnit =
                dyn_cast<ClangModuleUnit>(dc->getModuleScopeContext())) {
     auto clangModule = clangModuleUnit->getParentModule();
-    performImportResolutionForClangMacroBuffer(*macroSourceFile, clangModule);
+    const clang::Decl *clangDecl = target.get<Decl*>()->getClangDecl();
+    const clang::Module *M = clangDecl->getOwningModule();
+    performImportResolutionForClangMacroBuffer(*macroSourceFile, clangModule, M);
   }
   return macroSourceFile;
 }

test/Interop/C/swiftify-import/Inputs/TransitiveModules/module-a.h

@@ -0,0 +1,3 @@
+#pragma once
+
+typedef int a_t;

test/Interop/C/swiftify-import/Inputs/TransitiveModules/module-b.h

@@ -0,0 +1,3 @@
+#pragma once
+
+typedef int b_t;

test/Interop/C/swiftify-import/Inputs/TransitiveModules/module-c.h

@@ -0,0 +1,2 @@
+#pragma once
+typedef int c_t;

test/Interop/C/swiftify-import/Inputs/TransitiveModules/module.modulemap

@@ -0,0 +1,13 @@
+module ModuleA {
+    header "module-a.h"
+    export *
+}
+module ModuleB {
+    header "module-b.h"
+}
+module ModuleOuter {
+    module ModuleC {
+        header "module-c.h"
+        export *
+    }
+}

test/Interop/C/swiftify-import/Inputs/clang-includes.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "TransitiveModules/module-a.h"
+#include "TransitiveModules/module-b.h"
+#include "TransitiveModules/module-c.h"
+
+#define __counted_by(x) __attribute__((__counted_by__(x)))
+#define __noescape __attribute__((noescape))
+
+void basic_include(const a_t *__counted_by(len) p __noescape, a_t len);
+
+void non_exported_include(const b_t *__counted_by(len) p __noescape, b_t len);
+
+void submodule_include(const c_t *__counted_by(len) p __noescape, c_t len);

test/Interop/C/swiftify-import/Inputs/module.modulemap

@@ -26,3 +26,10 @@ module CommentsClang {
     header "comments.h"
     export *
 }
+module ClangIncludesModule {
+    header "clang-includes.h"
+    export *
+}
+module ClangIncludesNoExportModule {
+    header "clang-includes.h"
+}

test/Interop/C/swiftify-import/clang-includes-noexport.swift

@@ -0,0 +1,20 @@
+// REQUIRES: swift_feature_SafeInteropWrappers
+
+// RN: %target-swift-ide-test -print-module -module-to-print=ClangIncludesNoExportModule -plugin-path %swift-plugin-dir -I %S/Inputs -source-filename=x -enable-experimental-feature SafeInteropWrappers | %FileCheck %s
+
+// swift-ide-test doesn't currently typecheck the macro expansions, so run the compiler as well
+// RUN: %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/ClangIncludesNoExport.swiftmodule -I %S/Inputs -enable-experimental-feature SafeInteropWrappers %s
+
+import ClangIncludesNoExportModule
+
+public func callBasicInclude(_ p: Span<CInt>) {
+  basic_include(p)
+}
+
+public func callNonExported(_ p: Span<CInt>) {
+  non_exported_include(p)
+}
+
+public func callSubmoduleInclude(_ p: Span<CInt>) {
+  submodule_include(p)
+}

test/Interop/C/swiftify-import/clang-includes.swift

@@ -0,0 +1,20 @@
+// REQUIRES: swift_feature_SafeInteropWrappers
+
+// RN: %target-swift-ide-test -print-module -module-to-print=ClangIncludesModule -plugin-path %swift-plugin-dir -I %S/Inputs -source-filename=x -enable-experimental-feature SafeInteropWrappers | %FileCheck %s
+
+// swift-ide-test doesn't currently typecheck the macro expansions, so run the compiler as well
+// RUN: %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/ClangIncludes.swiftmodule -I %S/Inputs -enable-experimental-feature SafeInteropWrappers %s
+
+import ClangIncludesModule
+
+public func callBasicInclude(_ p: Span<CInt>) {
+  basic_include(p)
+}
+
+public func callNonExported(_ p: Span<CInt>) {
+  non_exported_include(p)
+}
+
+public func callSubmoduleInclude(_ p: Span<CInt>) {
+  submodule_include(p)
+}