[5.6] Multiple symbol-graph regressions

include/swift/AST/FileUnit.h

@@ -16,6 +16,7 @@
 #include "swift/AST/Module.h"
 #include "swift/AST/RawComment.h"
 #include "swift/Basic/BasicSourceInfo.h"
+#include "swift/Basic/Debug.h"
 
 #include "llvm/ADT/PointerIntPair.h"
 
@@ -308,6 +309,9 @@ class FileUnit : public DeclContext, public ASTAllocated<FileUnit> {
     return getParentModule()->getRealName().str();
   }
 
+  SWIFT_DEBUG_DUMPER(dumpDisplayDecls());
+  SWIFT_DEBUG_DUMPER(dumpTopLevelDecls());
+
   /// Traverse the decls within this file.
   ///
   /// \returns true if traversal was aborted, false if it completed

include/swift/AST/Module.h

@@ -26,6 +26,7 @@
 #include "swift/AST/Type.h"
 #include "swift/Basic/BasicSourceInfo.h"
 #include "swift/Basic/Compiler.h"
+#include "swift/Basic/Debug.h"
 #include "swift/Basic/OptionSet.h"
 #include "swift/Basic/STLExtras.h"
 #include "swift/Basic/SourceLoc.h"
@@ -856,6 +857,9 @@ class ModuleDecl
   /// transferred from module files to the dSYMs, remove this.
   bool isExternallyConsumed() const;
 
+  SWIFT_DEBUG_DUMPER(dumpDisplayDecls());
+  SWIFT_DEBUG_DUMPER(dumpTopLevelDecls());
+
   SourceRange getSourceRange() const { return SourceRange(); }
 
   static bool classof(const DeclContext *DC) {

include/swift/AST/SourceFile.h

@@ -288,6 +288,10 @@ class SourceFile final : public FileUnit {
 
   ~SourceFile();
 
+  bool hasImports() const {
+    return Imports.hasValue();
+  }
+
   /// Retrieve an immutable view of the source file's imports.
   ArrayRef<AttributedImport<ImportedModule>> getImports() const {
     return *Imports;

lib/AST/Module.cpp

@@ -780,6 +780,22 @@ void SourceFile::lookupObjCMethods(
   results.append(known->second.begin(), known->second.end());
 }
 
+static void collectParsedExportedImports(const ModuleDecl *M, SmallPtrSetImpl<ModuleDecl *> &Imports) {
+  for (const FileUnit *file : M->getFiles()) {
+    if (const SourceFile *source = dyn_cast<SourceFile>(file)) {
+      if (source->hasImports()) {
+        for (auto import : source->getImports()) {
+          if (import.options.contains(ImportFlags::Exported)) {
+            if (!Imports.contains(import.module.importedModule)) {
+              Imports.insert(import.module.importedModule);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
 void ModuleDecl::getLocalTypeDecls(SmallVectorImpl<TypeDecl*> &Results) const {
   FORWARD(getLocalTypeDecls, (Results));
 }
@@ -788,6 +804,24 @@ void ModuleDecl::getTopLevelDecls(SmallVectorImpl<Decl*> &Results) const {
   FORWARD(getTopLevelDecls, (Results));
 }
 
+void ModuleDecl::dumpDisplayDecls() const {
+  SmallVector<Decl *, 32> Decls;
+  getDisplayDecls(Decls);
+  for (auto *D : Decls) {
+    D->dump(llvm::errs());
+    llvm::errs() << "\n";
+  }
+}
+
+void ModuleDecl::dumpTopLevelDecls() const {
+  SmallVector<Decl *, 32> Decls;
+  getTopLevelDecls(Decls);
+  for (auto *D : Decls) {
+    D->dump(llvm::errs());
+    llvm::errs() << "\n";
+  }
+}
+
 void ModuleDecl::getExportedPrespecializations(
     SmallVectorImpl<Decl *> &Results) const {
   FORWARD(getExportedPrespecializations, (Results));
@@ -908,8 +942,23 @@ SourceFile::getExternalRawLocsForDecl(const Decl *D) const {
 }
 
 void ModuleDecl::getDisplayDecls(SmallVectorImpl<Decl*> &Results) const {
+  if (isParsedModule(this)) {
+    SmallPtrSet<ModuleDecl *, 4> Modules;
+    collectParsedExportedImports(this, Modules);
+    for (const ModuleDecl *import : Modules) {
+      import->getDisplayDecls(Results);
+    }
+  }
   // FIXME: Should this do extra access control filtering?
   FORWARD(getDisplayDecls, (Results));
+
+#ifndef NDEBUG
+  llvm::DenseSet<Decl *> visited;
+  for (auto *D : Results) {
+    auto inserted = visited.insert(D).second;
+    assert(inserted && "there should be no duplicate decls");
+  }
+#endif
 }
 
 ProtocolConformanceRef
@@ -3060,6 +3109,22 @@ void FileUnit::getTopLevelDeclsWhereAttributesMatch(
   Results.erase(newEnd, Results.end());
 }
 
+void FileUnit::dumpDisplayDecls() const {
+  SmallVector<Decl *, 32> Decls;
+  getDisplayDecls(Decls);
+  for (auto *D : Decls) {
+    D->dump(llvm::errs());
+  }
+}
+
+void FileUnit::dumpTopLevelDecls() const {
+  SmallVector<Decl *, 32> Decls;
+  getTopLevelDecls(Decls);
+  for (auto *D : Decls) {
+    D->dump(llvm::errs());
+  }
+}
+
 void swift::simple_display(llvm::raw_ostream &out, const FileUnit *file) {
   if (!file) {
     out << "(null)";

lib/SymbolGraphGen/SymbolGraph.cpp

@@ -99,6 +99,10 @@ PrintOptions SymbolGraph::getDeclarationFragmentsPrintOptions() const {
   ExcludeAttrs.insert(std::make_pair("DAK_Postfix", DAK_Postfix));
   ExcludeAttrs.insert(std::make_pair("DAK_Infix", DAK_Infix));
 
+  // In "emit modules separately" jobs, access modifiers show up as attributes,
+  // but we don't want them to be printed in declarations
+  ExcludeAttrs.insert(std::make_pair("DAK_AccessControl", DAK_AccessControl));
+
   for (const auto &Entry : ExcludeAttrs) {
     Opts.ExcludeAttrList.push_back(Entry.getValue());
   }

test/SourceKit/CursorInfo/cursor_symbol_graph.swift

@@ -182,15 +182,6 @@ enum MyEnum {
 // CHECKY:   "symbols": [
 // CHECKY:     {
 // CHECKY:       "accessLevel": "private",
-// CHECKY:       "declarationFragments": [
-// CHECKY:         {
-// CHECKY:           "kind": "keyword",
-// CHECKY:           "spelling": "private"
-// CHECKY:         },
-// CHECKY:         {
-// CHECKY:           "kind": "text",
-// CHECKY:           "spelling": " "
-// CHECKY:         },
 // CHECKY:         {
 // CHECKY:           "kind": "keyword",
 // CHECKY:           "spelling": "var"

test/SourceKit/CursorInfo/cursor_symbol_graph_referenced.swift

@@ -237,14 +237,6 @@ extension Parent {
 // PRIVATE:        "declarationFragments": [
 // PRIVATE-NEXT:     {
 // PRIVATE-NEXT:       "kind": "keyword",
-// PRIVATE-NEXT:       "spelling": "private"
-// PRIVATE-NEXT:     },
-// PRIVATE-NEXT:     {
-// PRIVATE-NEXT:       "kind": "text",
-// PRIVATE-NEXT:       "spelling": " "
-// PRIVATE-NEXT:     },
-// PRIVATE-NEXT:     {
-// PRIVATE-NEXT:       "kind": "keyword",
 // PRIVATE-NEXT:       "spelling": "func"
 // PRIVATE-NEXT:     },
 // PRIVATE-NEXT:     {
@@ -302,14 +294,6 @@ extension Parent {
 // SPI:        "declarationFragments": [
 // SPI-NEXT:     {
 // SPI-NEXT:       "kind": "keyword",
-// SPI-NEXT:       "spelling": "internal"
-// SPI-NEXT:     },
-// SPI-NEXT:     {
-// SPI-NEXT:       "kind": "text",
-// SPI-NEXT:       "spelling": " "
-// SPI-NEXT:     },
-// SPI-NEXT:     {
-// SPI-NEXT:       "kind": "keyword",
 // SPI-NEXT:       "spelling": "func"
 // SPI-NEXT:     },
 // SPI-NEXT:     {

test/SymbolGraph/ClangImporter/EmitWhileBuilding.swift

@@ -0,0 +1,30 @@
+// RUN: %empty-directory(%t)
+// RUN: cp -r %S/Inputs/EmitWhileBuilding/EmitWhileBuilding.framework %t
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-module-path %t/EmitWhileBuilding.framework/Modules/EmitWhileBuilding.swiftmodule/%target-swiftmodule-name -import-underlying-module -F %t -module-name EmitWhileBuilding -disable-objc-attr-requires-foundation-module %s %S/Inputs/EmitWhileBuilding/Extra.swift -emit-symbol-graph -emit-symbol-graph-dir %t
+// RUN: %{python} -m json.tool %t/EmitWhileBuilding.symbols.json %t/EmitWhileBuilding.formatted.symbols.json
+// RUN: %FileCheck %s --input-file %t/EmitWhileBuilding.formatted.symbols.json
+// RUN: %FileCheck %s --input-file %t/EmitWhileBuilding.formatted.symbols.json --check-prefix HEADER
+
+// REQUIRES: objc_interop
+
+import Foundation
+
+public enum SwiftEnum {}
+
+// HEADER:       "precise": "c:@testVariable"
+
+// CHECK:        "precise": "s:17EmitWhileBuilding9SwiftEnumO",
+// CHECK:        "declarationFragments": [
+// CHECK-NEXT:       {
+// CHECK-NEXT:           "kind": "keyword",
+// CHECK-NEXT:           "spelling": "enum"
+// CHECK-NEXT:       },
+// CHECK-NEXT:       {
+// CHECK-NEXT:           "kind": "text",
+// CHECK-NEXT:           "spelling": " "
+// CHECK-NEXT:       },
+// CHECK-NEXT:       {
+// CHECK-NEXT:           "kind": "identifier",
+// CHECK-NEXT:           "spelling": "SwiftEnum"
+// CHECK-NEXT:       }
+// CHECK-NEXT:   ],

test/SymbolGraph/ClangImporter/Inputs/EmitWhileBuilding/EmitWhileBuilding.framework/Headers/EmitWhileBuilding.h

@@ -0,0 +1 @@
+double testVariable = 1.0;

test/SymbolGraph/ClangImporter/Inputs/EmitWhileBuilding/EmitWhileBuilding.framework/module.map

@@ -0,0 +1,4 @@
+framework module EmitWhileBuilding {
+  header "EmitWhileBuilding.h"
+  export *
+}

test/SymbolGraph/ClangImporter/Inputs/EmitWhileBuilding/Extra.swift

@@ -0,0 +1 @@
+public struct SomeStruct {}