Merge pull request #40880 from apple/revert-40841-QuietMisdreavus/5.6/symgraph-regr

Revert "[5.6] Multiple symbol-graph regressions"

Author: shahmishal

include/swift/AST/FileUnit.h

@@ -16,7 +16,6 @@
 #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"
 
@@ -309,9 +308,6 @@ 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,7 +26,6 @@
 #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"
@@ -857,9 +856,6 @@ 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,10 +288,6 @@ 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,22 +780,6 @@ 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));
 }
@@ -804,24 +788,6 @@ 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));
@@ -942,23 +908,8 @@ 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
@@ -3114,22 +3065,6 @@ 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,10 +99,6 @@ 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,6 +182,15 @@ 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,6 +237,14 @@ 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:     {
@@ -294,6 +302,14 @@ 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:     {