Merge pull request #39431 from zoecarver/lazy-pt3-print-objc-module

[cxx-interop] Print decls in the __ObjC module.

Author: zoecarver

lib/ClangImporter/ClangImporter.cpp

@@ -2621,7 +2621,10 @@ class FilteringDeclaredDeclConsumer : public swift::VisibleDeclConsumer {
 
   void foundDecl(ValueDecl *VD, DeclVisibilityKind Reason,
                  DynamicLookupInfo dynamicLookupInfo) override {
-    if (isDeclaredInModule(ModuleFilter, VD))
+    if (isDeclaredInModule(ModuleFilter, VD) ||
+        // Sometimes imported decls get put into the clang header module. If we
+        // found one of these decls, don't filter it out.
+        VD->getModuleContext()->getName().str() == CLANG_HEADER_MODULE_NAME)
       NextConsumer.foundDecl(VD, Reason, dynamicLookupInfo);
   }
 };

lib/IDE/ModuleInterfacePrinting.cpp

@@ -660,7 +660,28 @@ void swift::ide::printModuleInterface(
     };
 
     if (auto clangNode = getEffectiveClangNode(D)) {
-      addToClangDecls(D, clangNode);
+      if (auto namespaceDecl =
+              dyn_cast_or_null<clang::NamespaceDecl>(clangNode.getAsDecl())) {
+        // An imported namespace decl will contain members from all redecls, so
+        // make sure we add all the redecls.
+        for (auto redecl : namespaceDecl->redecls()) {
+          // Namespace redecls may exist across mutliple modules. We want to
+          // add the decl "D" to every module that has a redecl. But we only
+          // want to add "D" once to prevent duplicate printing.
+          clang::SourceLocation loc = redecl->getLocation();
+          auto *owningModule = Importer.getClangOwningModule(redecl);
+          auto found = ClangDecls.find(owningModule);
+          if (found != ClangDecls.end() &&
+              // Don't re-add this decl if it already exists for "OwningModule".
+              llvm::find_if(found->second, [D](auto p) {
+                return p.first == D;
+              }) == found->second.end()) {
+            found->second.push_back({D, loc});
+          }
+        }
+      } else {
+        addToClangDecls(D, clangNode);
+      }
       continue;
     }
 

test/Interop/Cxx/namespace/submodules-module-interface.swift

@@ -1,28 +1,23 @@
-// RUN: %target-swift-ide-test -print-module -module-to-print=Submodules.SubmoduleA -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s -check-prefix=CHECK-A
-// RUN: %target-swift-ide-test -print-module -module-to-print=Submodules.SubmoduleB -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s -check-prefix=CHECK-B
+// RUN: %target-swift-ide-test -print-module -module-to-print=Submodules.SubmoduleA -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module -module-to-print=Submodules.SubmoduleB -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
 
-// CHECK-A-NOT: extension
-// CHECK-A: extension NS1 {
-// CHECK-A:   struct BasicA {
-// CHECK-A:   }
-// CHECK-A: }
-// CHECK-A-NOT: extension
-
-// CHECK-A: extension NS1.NS2 {
-// CHECK-A:   struct BasicDeepA {
-// CHECK-A:   }
-// CHECK-A: }
-// CHECK-A-NOT: extension
-
-// CHECK-B-NOT: extension
-// CHECK-B: extension NS1 {
-// CHECK-B:   struct BasicB {
-// CHECK-B:   }
-// CHECK-B: }
-// CHECK-B-NOT: extension
-
-// CHECK-B: extension NS1.NS2 {
-// CHECK-B:   struct BasicDeepB {
-// CHECK-B:   }
-// CHECK-B: }
-// CHECK-B-NOT: extension
+// CHECK:     extension NS1 {
+// CHECK-NEXT:   struct BasicA {
+// CHECK-NEXT:     init()
+// CHECK-NEXT:   }
+// CHECK-NEXT: }
+// CHECK-NEXT: extension NS1 {
+// CHECK-NEXT:   struct BasicB {
+// CHECK-NEXT:     init()
+// CHECK-NEXT:   }
+// CHECK-NEXT: }
+// CHECK-NEXT: extension NS1.NS2 {
+// CHECK-NEXT:   struct BasicDeepA {
+// CHECK-NEXT:     init()
+// CHECK-NEXT:   }
+// CHECK-NEXT: }
+// CHECK-NEXT: extension NS1.NS2 {
+// CHECK-NEXT:   struct BasicDeepB {
+// CHECK-NEXT:     init()
+// CHECK-NEXT:   }
+// CHECK-NEXT: }

test/api-digester/Outputs/clang-module-dump.txt

@@ -568,6 +568,77 @@
           "usr": "c:objc(pl)NSObject"
         }
       ]
+    },
+    {
+      "kind": "TypeAlias",
+      "name": "__NSConstantString",
+      "printedName": "__NSConstantString",
+      "children": [
+        {
+          "kind": "TypeNominal",
+          "name": "__NSConstantString_tag",
+          "printedName": "__ObjC.__NSConstantString_tag",
+          "usr": "c:@S@__NSConstantString_tag"
+        }
+      ],
+      "declKind": "TypeAlias",
+      "usr": "c:@T@__NSConstantString",
+      "moduleName": "__ObjC"
+    },
+    {
+      "kind": "TypeAlias",
+      "name": "__builtin_ms_va_list",
+      "printedName": "__builtin_ms_va_list",
+      "children": [
+        {
+          "kind": "TypeNominal",
+          "name": "UnsafeMutablePointer",
+          "printedName": "Swift.UnsafeMutablePointer<Swift.CChar>",
+          "children": [
+            {
+              "kind": "TypeNameAlias",
+              "name": "CChar",
+              "printedName": "Swift.CChar",
+              "children": [
+                {
+                  "kind": "TypeNominal",
+                  "name": "Int8",
+                  "printedName": "Swift.Int8",
+                  "usr": "s:s4Int8V"
+                }
+              ]
+            }
+          ],
+          "usr": "s:Sp"
+        }
+      ],
+      "declKind": "TypeAlias",
+      "usr": "c:@T@__builtin_ms_va_list",
+      "moduleName": "__ObjC"
+    },
+    {
+      "kind": "TypeAlias",
+      "name": "__builtin_va_list",
+      "printedName": "__builtin_va_list",
+      "children": [
+        {
+          "kind": "TypeNominal",
+          "name": "Paren",
+          "printedName": "(__ObjC.__va_list_tag)",
+          "children": [
+            {
+              "kind": "TypeNominal",
+              "name": "__va_list_tag",
+              "printedName": "__ObjC.__va_list_tag",
+              "usr": "c:@S@__va_list_tag"
+            }
+          ],
+          "usr": "c:@S@__va_list_tag"
+        }
+      ],
+      "declKind": "TypeAlias",
+      "usr": "c:@T@__builtin_va_list",
+      "moduleName": "__ObjC"
     }
   ],
   "json_format_version": 6