Reinstate r281429, reverted in r281452, with a fix for its mishandling of
compiles without -fmodules-local-submodule-visibility. Original commit message:
[modules] When merging one definition into another, propagate the list of
re-exporting modules from the discarded definition to the retained definition.
llvm-svn: 284176
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index e2fe6d25..e1be749 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -888,18 +888,72 @@
if (auto *Listener = getASTMutationListener())
Listener->RedefinedHiddenDefinition(ND, M);
- if (getLangOpts().ModulesLocalVisibility)
- MergedDefModules[ND].push_back(M);
- else
+ auto *Merged = &MergedDefModules[ND];
+ if (auto *CanonDef = Merged->CanonicalDef) {
+ ND = CanonDef;
+ Merged = &MergedDefModules[ND];
+ }
+ assert(!Merged->CanonicalDef && "canonical def not canonical");
+
+ Merged->MergedModules.push_back(M);
+
+ if (!getLangOpts().ModulesLocalVisibility)
ND->setHidden(false);
}
+void ASTContext::mergeDefinitionIntoModulesOf(NamedDecl *Def,
+ NamedDecl *Other) {
+ // We need to know the owning module of the merge source.
+ assert(Other->isFromASTFile() && "merge of non-imported decl not supported");
+ assert(Def != Other && "merging definition into itself");
+
+ if (!getLangOpts().ModulesLocalVisibility && !Other->isHidden())
+ Def->setHidden(false);
+ else
+ assert(Other->getImportedOwningModule() &&
+ "hidden, imported declaration has no owning module");
+
+ // Mark Def as the canonical definition of merged definition Other.
+ {
+ auto &OtherMerged = MergedDefModules[Other];
+ assert((!OtherMerged.CanonicalDef || OtherMerged.CanonicalDef == Def) &&
+ "mismatched canonical definitions for declaration");
+ OtherMerged.CanonicalDef = Def;
+ }
+
+ auto &Merged = MergedDefModules[Def];
+ // Grab this again, we potentially just invalidated our reference.
+ auto &OtherMerged = MergedDefModules[Other];
+
+ if (Module *M = Other->getImportedOwningModule())
+ Merged.MergedModules.push_back(M);
+
+ // If this definition had any others merged into it, they're now merged into
+ // the canonical definition instead.
+ if (!OtherMerged.MergedModules.empty()) {
+ assert(!Merged.CanonicalDef && "canonical definition not canonical");
+ if (Merged.MergedModules.empty())
+ Merged.MergedModules = std::move(OtherMerged.MergedModules);
+ else
+ Merged.MergedModules.insert(Merged.MergedModules.end(),
+ OtherMerged.MergedModules.begin(),
+ OtherMerged.MergedModules.end());
+ OtherMerged.MergedModules.clear();
+ }
+}
+
void ASTContext::deduplicateMergedDefinitonsFor(NamedDecl *ND) {
auto It = MergedDefModules.find(ND);
if (It == MergedDefModules.end())
return;
- auto &Merged = It->second;
+ if (auto *CanonDef = It->second.CanonicalDef) {
+ It = MergedDefModules.find(CanonDef);
+ if (It == MergedDefModules.end())
+ return;
+ }
+
+ auto &Merged = It->second.MergedModules;
llvm::DenseSet<Module*> Found;
for (Module *&M : Merged)
if (!Found.insert(M).second)