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

swift-module-digester: when we have multiple extensions to a single external type, we should synthesize only one type decl node.

Browse Source
This commit is contained in:
Xi Ge
2018-09-20 16:13:37 -07:00
parent 08c8cf14e5
commit 6cc5855bcf
5 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/swift-api-digester/ModuleAnalyzerNodes.cpp
View File

@@ -1216,13 +1216,16 @@ static SDKNode *constructTypeDeclNode(SDKContext &Ctx, NominalTypeDecl *NTD,
/// synthesize this type node to include those extension members, since these
/// extension members are legit members of the module.
static SDKNode *constructExternalExtensionNode(SDKContext &Ctx, SDKNode *Root,
ExtensionDecl *Ext,
NominalTypeDecl *NTD,
ArrayRef<ExtensionDecl*> AllExts,
std::set<ExtensionDecl*> &HandledExts) {
auto *TypeNode = SDKNodeInitInfo(Ctx, Ext->getSelfNominalTypeDecl())
.createSDKNode(SDKNodeKind::DeclType);
auto *TypeNode = SDKNodeInitInfo(Ctx, NTD).createSDKNode(SDKNodeKind::DeclType);
// The members of the extension are the only members of this synthesized type.
addMembersToRoot(Ctx, TypeNode, Ext, HandledExts);
// The members of the extensions are the only members of this synthesized type.
for (auto *Ext: AllExts) {
HandledExts.insert(Ext);
addMembersToRoot(Ctx, TypeNode, Ext, HandledExts);
}
return TypeNode;
}
@@ -1302,16 +1305,20 @@ void SwiftDeclCollector::lookupVisibleDecls(ArrayRef<ModuleDecl *> Modules) {
for (auto *VD : ClangMacros)
processDecl(VD);
// For all known decls, collect those unhandled extensions and handle them
// separately.
// Collect extensions to types from other modules and synthesize type nodes
// for them.
llvm::MapVector<NominalTypeDecl*, llvm::SmallVector<ExtensionDecl*, 4>> ExtensionMap;
for (auto *D: KnownDecls) {
if (auto *Ext = dyn_cast<ExtensionDecl>(D)) {
if (HandledExtensions.find(Ext) == HandledExtensions.end()) {
RootNode->addChild(constructExternalExtensionNode(Ctx, RootNode, Ext,
HandledExtensions));
ExtensionMap[Ext->getExtendedNominal()].push_back(Ext);
}
}
}
for (auto Pair: ExtensionMap) {
RootNode->addChild(constructExternalExtensionNode(Ctx, RootNode,
Pair.first, Pair.second, HandledExtensions));
}
}
void SwiftDeclCollector::processDecl(ValueDecl *VD) {