diff options
Diffstat (limited to 'clang/lib/AST/ASTContext.cpp')
-rw-r--r-- | clang/lib/AST/ASTContext.cpp | 64 |
1 files changed, 4 insertions, 60 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index 34eced3f4b1..3da1c74bc12 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -888,74 +888,18 @@ void ASTContext::mergeDefinitionIntoModule(NamedDecl *ND, Module *M, if (auto *Listener = getASTMutationListener()) Listener->RedefinedHiddenDefinition(ND, M); - 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) + if (getLangOpts().ModulesLocalVisibility) + MergedDefModules[ND].push_back(M); + else 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 (!Other->isHidden()) { - Def->setHidden(false); - return; - } - - 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; - if (auto *CanonDef = It->second.CanonicalDef) { - It = MergedDefModules.find(CanonDef); - if (It == MergedDefModules.end()) - return; - } - - auto &Merged = It->second.MergedModules; + auto &Merged = It->second; llvm::DenseSet<Module*> Found; for (Module *&M : Merged) if (!Found.insert(M).second) |