crawl underlying clang modules for re-exports

Author: QuietMisdreavus

lib/AST/Module.cpp

@@ -1467,9 +1467,8 @@ collectExportedImports(const ModuleDecl *topLevelModule,
                                  ModuleDecl::ImportFilterKind::Exported);
         for (const auto &im : exportedImports) {
           // Skip collecting the underlying clang module as we already have the relevant import.
-          if (module->isClangOverlayOf(im.importedModule))
-            continue;
-          importCollector.collect(im);
+          if (!module->isClangOverlayOf(im.importedModule))
+            importCollector.collect(im);
           if (!visited.contains(im.importedModule)) {
             visited.insert(im.importedModule);
             stack.push_back(im.importedModule);

lib/ClangImporter/ClangImporter.cpp

@@ -3653,11 +3653,11 @@ void ClangModuleUnit::getTopLevelDecls(SmallVectorImpl<Decl*> &results) const {
     };
     // Retrieve all of the globals that will be mapped to members.
 
-    // FIXME: Since we don't represent Clang submodules as Swift
-    // modules, we're getting everything.
     llvm::SmallPtrSet<ExtensionDecl *, 8> knownExtensions;
     for (auto entry : lookupTable->allGlobalsAsMembers()) {
       auto decl = entry.get<clang::NamedDecl *>();
+      if (decl->getOwningModule() != clangModule) continue;
+
       Decl *importedDecl = owner.importDecl(decl, owner.CurrentVersion);
       if (!importedDecl) continue;
 

test/SymbolGraph/ClangImporter/SwiftNameExtension.swift

@@ -0,0 +1,34 @@
+// REQUIRES: objc_interop
+
+// RUN: %empty-directory(%t)
+// RUN: split-file %s %t
+
+// RUN: %target-swift-symbolgraph-extract -sdk %clang-importer-sdk -module-name SwiftName -F %t/frameworks -output-dir %t -pretty-print -v
+// RUN: %FileCheck %s --input-file %t/SwiftName.symbols.json
+
+//--- frameworks/SwiftName.framework/Modules/module.modulemap
+framework module SwiftName {
+  umbrella header "SwiftName.h"
+  export *
+  module * { export * }
+}
+
+//--- frameworks/SwiftName.framework/Headers/SwiftName.h
+#import "OtherHeader.h"
+
+typedef struct {
+    double val;
+} MyDouble;
+
+// The swift_name attribute below generates extension decls in both header modules, which trips an
+// assertion if they are both added in getDisplayDecls. Make sure that this does not crash when a
+// symbol graph is generated.
+
+// CHECK-DAG: "precise": "c:SwiftName.h@MyDoubleFixedValue"
+__attribute__((swift_name("MyDouble.FixedValue")))
+static double MyDoubleFixedValue = 0.0;
+
+//--- frameworks/SwiftName.framework/Headers/OtherHeader.h
+// CHECK-DAG: "precise": "c:OtherHeader.h@myVar"
+static int myVar = 0;
+

test/SymbolGraph/ClangImporter/UmbrellaFramework.swift

@@ -0,0 +1,39 @@
+// REQUIRES: objc_interop
+
+// RUN: %empty-directory(%t)
+// RUN: mkdir -p %t/frameworks/UmbrellaFramework.framework/Modules/UmbrellaFramework.swiftmodule
+// RUN: split-file %s %t
+
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-module -o %t/frameworks/UmbrellaFramework.framework/Modules/UmbrellaFramework.swiftmodule/%target-swiftmodule-name -import-underlying-module -F %t/frameworks -module-name UmbrellaFramework -disable-objc-attr-requires-foundation-module %t/UmbrellaSwift.swift -emit-symbol-graph -emit-symbol-graph-dir %t
+// RUN: %target-swift-symbolgraph-extract -sdk %clang-importer-sdk -module-name UmbrellaFramework -F %t/frameworks -output-dir %t -pretty-print -v
+// RUN: %FileCheck %s --input-file %t/UmbrellaFramework.symbols.json
+
+// Ensure that Clang modules with umbrella headers and 'module * { export * }' correctly include
+// all their headers' symbols when Swift symbols are also present.
+
+//--- UmbrellaSwift.swift
+@_exported import UmbrellaFramework
+
+// CHECK-DAG: "precise": "s:17UmbrellaFramework12SomeProtocolP"
+public protocol SomeProtocol {}
+
+//--- frameworks/UmbrellaFramework.framework/Modules/module.modulemap
+framework module UmbrellaFramework [system] {
+  umbrella header "UmbrellaFramework.h"
+  export *
+  module * { export * }
+}
+
+//--- frameworks/UmbrellaFramework.framework/Headers/UmbrellaFramework.h
+#include "HeaderOne.h"
+#include "HeaderTwo.h"
+// CHECK-DAG: "precise": "c:@umbrellaVar"
+static int umbrellaVar = 0;
+
+//--- frameworks/UmbrellaFramework.framework/Headers/HeaderOne.h
+// CHECK-DAG: "precise": "c:@varOne"
+static int varOne = 1;
+
+//--- frameworks/UmbrellaFramework.framework/Headers/HeaderTwo.h
+// CHECK-DAG: "precise": "c:@varTwo"
+static int varTwo = 2;