averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

only recurse getDisplayDecls in SymbolGraphGen

Browse Source
This commit is contained in:
Victoria Mitchell
2022-02-03 12:19:37 -07:00
parent 036d78f6ad
commit cab1669e09
14 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/swift/AST/FileUnit.h
View File

@@ -246,7 +246,7 @@ public:
///
/// This can differ from \c getTopLevelDecls, e.g. it returns decls from a
/// shadowed clang module.
virtual void getDisplayDecls(SmallVectorImpl<Decl*> &results) const {
virtual void getDisplayDecls(SmallVectorImpl<Decl*> &results, bool recursive = false) const {
getTopLevelDecls(results);
}

2
include/swift/AST/Module.h
View File

@@ -780,7 +780,7 @@ public:
/// shadowed clang module. It does not force synthesized top-level decls that
/// should be printed to be added; use \c swift::getTopLevelDeclsForDisplay()
/// for that.
void getDisplayDecls(SmallVectorImpl<Decl*> &results) const;
void getDisplayDecls(SmallVectorImpl<Decl*> &results, bool recursive = false) const;
using LinkLibraryCallback = llvm::function_ref<void(LinkLibrary)>;

2
include/swift/ClangImporter/ClangModule.h
View File

@@ -91,7 +91,7 @@ public:
virtual void getTopLevelDecls(SmallVectorImpl<Decl*> &results) const override;
virtual void getDisplayDecls(SmallVectorImpl<Decl*> &results) const override;
virtual void getDisplayDecls(SmallVectorImpl<Decl*> &results, bool recursive = false) const override;
virtual void
getImportedModules(SmallVectorImpl<ImportedModule> &imports,

2
include/swift/Sema/IDETypeChecking.h
View File

@@ -145,7 +145,7 @@ namespace swift {
/// \c ModuleDecl::getDisplayDecls() would only return if previous
/// work happened to have synthesized them.
void
getTopLevelDeclsForDisplay(ModuleDecl *M, SmallVectorImpl<Decl*> &Results);
getTopLevelDeclsForDisplay(ModuleDecl *M, SmallVectorImpl<Decl*> &Results, bool Recursive = false);
struct ExtensionInfo {
// The extension with the declarations to apply.

2
include/swift/Serialization/SerializedModuleLoader.h
View File

@@ -433,7 +433,7 @@ public:
virtual void
getOpaqueReturnTypeDecls(SmallVectorImpl<OpaqueTypeDecl*> &results) const override;
virtual void getDisplayDecls(SmallVectorImpl<Decl*> &results) const override;
virtual void getDisplayDecls(SmallVectorImpl<Decl*> &results, bool recursive = false) const override;
virtual void
getImportedModules(SmallVectorImpl<ImportedModule> &imports,

30
lib/AST/Module.cpp
View File

@@ -949,30 +949,32 @@ SourceFile::getExternalRawLocsForDecl(const Decl *D) const {
return Result;
}
void ModuleDecl::getDisplayDecls(SmallVectorImpl<Decl*> &Results) const {
if (isParsedModule(this)) {
void ModuleDecl::getDisplayDecls(SmallVectorImpl<Decl*> &Results, bool Recursive) const {
if (Recursive && isParsedModule(this)) {
SmallPtrSet<ModuleDecl *, 4> Modules;
collectParsedExportedImports(this, Modules);
for (const ModuleDecl *import : Modules) {
import->getDisplayDecls(Results);
import->getDisplayDecls(Results, Recursive);
}
}
// FIXME: Should this do extra access control filtering?
FORWARD(getDisplayDecls, (Results));
#ifndef NDEBUG
llvm::DenseSet<Decl *> visited;
for (auto *D : Results) {
// decls synthesized from implicit clang decls may appear multiple times;
// e.g. if multiple modules with underlying clang modules are re-exported.
// including duplicates of these is harmless, so skip them when counting
// this assertion
if (const auto *CD = D->getClangDecl()) {
if (CD->isImplicit()) continue;
}
if (Recursive) {
llvm::DenseSet<Decl *> visited;
for (auto *D : Results) {
// decls synthesized from implicit clang decls may appear multiple times;
// e.g. if multiple modules with underlying clang modules are re-exported.
// including duplicates of these is harmless, so skip them when counting
// this assertion
if (const auto *CD = D->getClangDecl()) {
if (CD->isImplicit()) continue;
}
auto inserted = visited.insert(D).second;
assert(inserted && "there should be no duplicate decls");
auto inserted = visited.insert(D).second;
assert(inserted && "there should be no duplicate decls");
}
}
#endif
}

2
lib/ClangImporter/ClangImporter.cpp
View File

@@ -3249,7 +3249,7 @@ static void getImportDecls(ClangModuleUnit *ClangUnit, const clang::Module *M,
}
}
void ClangModuleUnit::getDisplayDecls(SmallVectorImpl<Decl*> &results) const {
void ClangModuleUnit::getDisplayDecls(SmallVectorImpl<Decl*> &results, bool recursive) const {
if (clangModule)
getImportDecls(const_cast<ClangModuleUnit *>(this), clangModule, results);
getTopLevelDecls(results);

2
lib/ClangImporter/DWARFImporter.cpp
View File

@@ -64,7 +64,7 @@ public:
getTopLevelDecls(SmallVectorImpl<Decl *> &results) const override {}
virtual void
getDisplayDecls(SmallVectorImpl<Decl *> &results) const override {}
getDisplayDecls(SmallVectorImpl<Decl *> &results, bool recursive = false) const override {}
virtual void
getImportedModules(SmallVectorImpl<ImportedModule> &imports,

7
lib/IDE/IDETypeChecking.cpp
View File

@@ -35,9 +35,10 @@ using namespace swift;
void
swift::getTopLevelDeclsForDisplay(ModuleDecl *M,
SmallVectorImpl<Decl*> &Results) {
SmallVectorImpl<Decl*> &Results,
bool Recursive) {
auto startingSize = Results.size();
M->getDisplayDecls(Results);
M->getDisplayDecls(Results, Recursive);
// Force Sendable on all types, which might synthesize some extensions.
// FIXME: We can remove this if @_nonSendable stops creating extensions.
@@ -49,7 +50,7 @@ swift::getTopLevelDeclsForDisplay(ModuleDecl *M,
// Remove what we fetched and fetch again, possibly now with additional
// extensions.
Results.resize(startingSize);
M->getDisplayDecls(Results);
M->getDisplayDecls(Results, Recursive);
}
static bool shouldPrintAsFavorable(const Decl *D, const PrintOptions &Options) {

4
lib/Serialization/ModuleFile.cpp
View File

@@ -973,9 +973,9 @@ ModuleFile::getOpaqueReturnTypeDecls(SmallVectorImpl<OpaqueTypeDecl *> &results)
}
}
void ModuleFile::getDisplayDecls(SmallVectorImpl<Decl *> &results) {
void ModuleFile::getDisplayDecls(SmallVectorImpl<Decl *> &results, bool recursive) {
if (UnderlyingModule)
UnderlyingModule->getDisplayDecls(results);
UnderlyingModule->getDisplayDecls(results, recursive);
PrettyStackTraceModuleFile stackEntry(*this);
getImportDecls(results);

2
lib/Serialization/ModuleFile.h
View File

@@ -684,7 +684,7 @@ public:
/// This includes all decls that should be displayed to clients of the module.
/// This can differ from \c getTopLevelDecls, e.g. it returns decls from a
/// shadowed clang module.
void getDisplayDecls(SmallVectorImpl<Decl*> &results);
void getDisplayDecls(SmallVectorImpl<Decl*> &results, bool recursive = false);
StringRef getModuleFilename() const {
if (!Core->ModuleInterfacePath.empty())

4
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -1561,8 +1561,8 @@ SerializedASTFile::getOpaqueReturnTypeDecls(
}
void
SerializedASTFile::getDisplayDecls(SmallVectorImpl<Decl*> &results) const {
File.getDisplayDecls(results);
SerializedASTFile::getDisplayDecls(SmallVectorImpl<Decl*> &results, bool recursive) const {
File.getDisplayDecls(results, recursive);
}
StringRef SerializedASTFile::getFilename() const {

2
lib/SymbolGraphGen/SymbolGraphGen.cpp
View File

@@ -57,7 +57,7 @@ symbolgraphgen::emitSymbolGraphForModule(ModuleDecl *M,
const SymbolGraphOptions &Options) {
SymbolGraphASTWalker Walker(*M, Options);
SmallVector<Decl *, 64> ModuleDecls;
swift::getTopLevelDeclsForDisplay(M, ModuleDecls);
swift::getTopLevelDeclsForDisplay(M, ModuleDecls, /*recursive*/true);
if (Options.PrintMessages)
llvm::errs() << ModuleDecls.size()

12
test/ModuleInterface/exported-import.swift Normal file
View File

@@ -0,0 +1,12 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -emit-module-path %t/Other.swiftmodule -module-name Other %S/Inputs/other.swift
// RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -emit-module-path /dev/null -emit-module-interface-path %t/ExportedImport.swiftmodule -module-name ExportedImport %s -I %t
// RUN: %FileCheck --input-file %t/ExportedImport.swiftmodule %s
// CHECK-NOT: otherFileFunction
@_exported import Other
// CHECK: public struct SomeStruct
public struct SomeStruct {}