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

Add method to ModuleDecl to lazily compute the underlying module for cross-import overlays

Browse Source 
Also update code completion, indexing, interface generation and doc info to use it.
This commit is contained in:
Nathan Hawes
2020-03-31 11:08:09 -07:00
parent d922041ac5
commit 9f6f76308e
16 changed files with 360 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp
View File

@@ -65,7 +65,7 @@ struct TextEntity {
const Decl *Dcl = nullptr;
TypeOrExtensionDecl SynthesizeTarget;
const Decl *DefaultImplementationOf = nullptr;
ModuleDecl *UnderlyingModIfFromOverlay = nullptr;
ModuleDecl *DeclaringModIfFromCrossImportOverlay = nullptr;
StringRef Argument;
TextRange Range;
unsigned LocOffset = 0;
@@ -305,7 +305,7 @@ static bool initDocEntityInfo(const Decl *D,
const Decl *DefaultImplementationOf, bool IsRef,
bool IsSynthesizedExtension, DocEntityInfo &Info,
StringRef Arg = StringRef(),
ModuleDecl *ModIfFromOverlay = nullptr){
ModuleDecl *DeclaringModForCrossImport = nullptr){
if (!IsRef && D->isImplicit())
return true;
if (!D || isa<ParamDecl>(D) ||
@@ -412,13 +412,19 @@ static bool initDocEntityInfo(const Decl *D,
}
}
if (ModIfFromOverlay) {
if (DeclaringModForCrossImport) {
ModuleDecl *MD = D->getModuleContext();
SmallVector<Identifier, 1> Bystanders;
ModIfFromOverlay->getAllBystandersForCrossImportOverlay(MD, Bystanders);
std::transform(Bystanders.begin(), Bystanders.end(),
std::back_inserter(Info.RequiredBystanders),
[](Identifier Bystander){ return Bystander.str().str(); });
if (MD->getRequiredBystandersIfCrossImportOverlay(
DeclaringModForCrossImport, Bystanders)) {
std::transform(Bystanders.begin(), Bystanders.end(),
std::back_inserter(Info.RequiredBystanders),
[](Identifier Bystander){
return Bystander.str().str();
});
} else {
llvm_unreachable("DeclaringModForCrossImport not correct?");
}
}
}
@@ -458,7 +464,7 @@ static bool initDocEntityInfo(const TextEntity &Entity,
Entity.DefaultImplementationOf,
/*IsRef=*/false, Entity.IsSynthesizedExtension,
Info, Entity.Argument,
Entity.UnderlyingModIfFromOverlay))
Entity.DeclaringModIfFromCrossImportOverlay))
return true;
Info.Offset = Entity.Range.Offset;
Info.Length = Entity.Range.Length;
@@ -981,8 +987,8 @@ static bool getModuleInterfaceInfo(ASTContext &Ctx, StringRef ModuleName,
auto *EntityMod = Entity.Dcl->getModuleContext();
if (!EntityMod || EntityMod == M)
continue;
if (M->isUnderlyingModuleOfCrossImportOverlay(EntityMod))
Entity.UnderlyingModIfFromOverlay = M;
if (EntityMod->isCrossImportOverlayOf(M))
Entity.DeclaringModIfFromCrossImportOverlay = M;
}
return false;
}