Merge pull request #80130 from swiftlang/egorzhdan/submodules-name-for-lookup

[cxx-interop] Determine owning module correctly for C++ decls in nested modules

Author: egorzhdan

lib/AST/Decl.cpp

@@ -916,6 +916,10 @@ static ModuleDecl *getModuleContextForNameLookupForCxxDecl(const Decl *decl) {
   if (!clangModule)
     return nullptr;
 
+  // Swift groups all submodules of a Clang module together, and imports them as
+  // a single top-level module.
+  clangModule = clangModule->getTopLevelModule();
+
   return ctx.getClangModuleLoader()->getWrapperForModule(clangModule);
 }
 

test/Interop/Cxx/modules/Inputs/another-deep-submodule.h

@@ -0,0 +1,2 @@
+namespace NS {
+} // namespace NS

test/Interop/Cxx/modules/Inputs/deep-submodule.h

@@ -0,0 +1,5 @@
+namespace NS {
+
+struct MyStructInDeepSubModule {};
+
+} // namespace NS

test/Interop/Cxx/modules/Inputs/module.modulemap

@@ -2,3 +2,18 @@ module Namespaces {
   header "namespace.h"
   requires cplusplus
 }
+
+module TopLevelModule {
+  module SubModule {
+    module DeepSubModule {
+      header "deep-submodule.h"
+      export *
+    }
+    module AnotherDeepSubModule {
+      header "another-deep-submodule.h"
+      export *
+    }
+    export *
+  }
+  export *
+}

test/Interop/Cxx/modules/deep-submodule.swift

@@ -0,0 +1,20 @@
+// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=default
+// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=default -enable-upcoming-feature MemberImportVisibility
+// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=default -D IMPORT_TOP_LEVEL
+// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=default -D IMPORT_ANOTHER_SUBMODULE
+
+// REQUIRES: swift_feature_MemberImportVisibility
+
+#if IMPORT_TOP_LEVEL
+import TopLevelModule
+#elseif IMPORT_ANOTHER_SUBMODULE
+import TopLevelModule.SubModule.AnotherDeepSubModule
+#else
+import TopLevelModule.SubModule.DeepSubModule
+#endif
+
+let _: NS.MyStructInDeepSubModule! = nil
+
+extension NS.MyStructInDeepSubModule {
+  public static func takesInstance(_ i: NS.MyStructInDeepSubModule) {}
+}