From: Benjamin Kramer Date: Mon, 17 Oct 2016 13:00:44 +0000 (+0000) Subject: Revert "Reinstate r281429, reverted in r281452, with a fix for its mishandling of" X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76d791457d3afebeb82cb624b26057ace8262a27;p=clang Revert "Reinstate r281429, reverted in r281452, with a fix for its mishandling of" This reverts commit r284176. It still marks some modules as invisible that should be visible. Will follow up with the author with a test case. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@284382 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/ASTContext.h b/include/clang/AST/ASTContext.h index f5a9bd2da5..3d777524b8 100644 --- a/include/clang/AST/ASTContext.h +++ b/include/clang/AST/ASTContext.h @@ -308,18 +308,10 @@ class ASTContext : public RefCountedBase { /// merged into. llvm::DenseMap MergedDecls; - /// The modules into which a definition has been merged, or a map from a - /// merged definition to its canonical definition. This is really a union of - /// a NamedDecl* and a vector of Module*. - struct MergedModulesOrCanonicalDef { - llvm::TinyPtrVector MergedModules; - NamedDecl *CanonicalDef = nullptr; - }; - /// \brief A mapping from a defining declaration to a list of modules (other /// than the owning module of the declaration) that contain merged /// definitions of that entity. - llvm::DenseMap MergedDefModules; + llvm::DenseMap> MergedDefModules; /// \brief Initializers for a module, in order. Each Decl will be either /// something that has a semantic effect on startup (such as a variable with @@ -891,7 +883,6 @@ public: /// and should be visible whenever \p M is visible. void mergeDefinitionIntoModule(NamedDecl *ND, Module *M, bool NotifyListeners = true); - void mergeDefinitionIntoModulesOf(NamedDecl *ND, NamedDecl *Other); /// \brief Clean up the merged definition list. Call this if you might have /// added duplicates into the list. void deduplicateMergedDefinitonsFor(NamedDecl *ND); @@ -902,9 +893,7 @@ public: auto MergedIt = MergedDefModules.find(Def); if (MergedIt == MergedDefModules.end()) return None; - if (auto *CanonDef = MergedIt->second.CanonicalDef) - return getModulesWithMergedDefinition(CanonDef); - return MergedIt->second.MergedModules; + return MergedIt->second; } /// Add a declaration to the list of declarations that are initialized diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 34eced3f4b..3da1c74bc1 100644 --- a/lib/AST/ASTContext.cpp +++ b/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 Found; for (Module *&M : Merged) if (!Found.insert(M).second) diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp index ac136e95b4..8ce118ce71 100644 --- a/lib/Serialization/ASTReader.cpp +++ b/lib/Serialization/ASTReader.cpp @@ -3481,10 +3481,23 @@ void ASTReader::makeModuleVisible(Module *Mod, /// visible. void ASTReader::mergeDefinitionVisibility(NamedDecl *Def, NamedDecl *MergedDef) { + // FIXME: This doesn't correctly handle the case where MergedDef is visible + // in modules other than its owning module. We should instead give the + // ASTContext a list of merged definitions for Def. if (Def->isHidden()) { // If MergedDef is visible or becomes visible, make the definition visible. - getContext().mergeDefinitionIntoModulesOf(Def, MergedDef); - PendingMergedDefinitionsToDeduplicate.insert(Def); + if (!MergedDef->isHidden()) + Def->Hidden = false; + else if (getContext().getLangOpts().ModulesLocalVisibility) { + getContext().mergeDefinitionIntoModule( + Def, MergedDef->getImportedOwningModule(), + /*NotifyListeners*/ false); + PendingMergedDefinitionsToDeduplicate.insert(Def); + } else { + auto SubmoduleID = MergedDef->getOwningModuleID(); + assert(SubmoduleID && "hidden definition in no module"); + HiddenNamesMap[getSubmodule(SubmoduleID)].push_back(Def); + } } } @@ -8619,7 +8632,7 @@ void ASTReader::finishPendingActions() { const FunctionDecl *Defn = nullptr; if (!getContext().getLangOpts().Modules || !FD->hasBody(Defn)) FD->setLazyBody(PB->second); - else if (FD != Defn) + else mergeDefinitionVisibility(const_cast(Defn), FD); continue; } diff --git a/test/Modules/Inputs/merge-template-pattern-visibility/a.h b/test/Modules/Inputs/merge-template-pattern-visibility/a.h index b960ba6f57..e659202761 100644 --- a/test/Modules/Inputs/merge-template-pattern-visibility/a.h +++ b/test/Modules/Inputs/merge-template-pattern-visibility/a.h @@ -4,8 +4,3 @@ template struct B; template struct A {}; template struct B : A {}; template inline auto C(T) {} - -namespace CrossModuleMerge { - template inline auto D(T) {} - struct E {}; -} diff --git a/test/Modules/Inputs/merge-template-pattern-visibility/b.h b/test/Modules/Inputs/merge-template-pattern-visibility/b.h index 260b6b318e..41b52d5e6a 100644 --- a/test/Modules/Inputs/merge-template-pattern-visibility/b.h +++ b/test/Modules/Inputs/merge-template-pattern-visibility/b.h @@ -17,7 +17,4 @@ namespace CrossModuleMerge { template struct A {}; template struct B : A {}; template inline auto C(T) {} - - template inline auto D(T) {} - struct E; } diff --git a/test/Modules/Inputs/merge-template-pattern-visibility/c.h b/test/Modules/Inputs/merge-template-pattern-visibility/c.h index 01594bb4b8..db80eda1ea 100644 --- a/test/Modules/Inputs/merge-template-pattern-visibility/c.h +++ b/test/Modules/Inputs/merge-template-pattern-visibility/c.h @@ -5,8 +5,5 @@ namespace CrossModuleMerge { template struct A {}; template struct B : A {}; template inline auto C(T) {} - - template inline auto D(T) {} - struct E {}; } diff --git a/test/Modules/Inputs/merge-template-pattern-visibility/d.h b/test/Modules/Inputs/merge-template-pattern-visibility/d.h index 7bbd01ebce..464f0f5bbe 100644 --- a/test/Modules/Inputs/merge-template-pattern-visibility/d.h +++ b/test/Modules/Inputs/merge-template-pattern-visibility/d.h @@ -1,3 +1 @@ -namespace CrossModuleMerge { - struct E {}; -} +// d.h: empty diff --git a/test/Modules/Inputs/merge-var-template-def/a.h b/test/Modules/Inputs/merge-var-template-def/a.h deleted file mode 100644 index cce887530d..0000000000 --- a/test/Modules/Inputs/merge-var-template-def/a.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef A_H -#define A_H -template struct A { static bool b; }; -template bool A::b = false; -template void *get() { return &(A::b); } -#endif diff --git a/test/Modules/Inputs/merge-var-template-def/b1.h b/test/Modules/Inputs/merge-var-template-def/b1.h deleted file mode 100644 index 1ef89746f7..0000000000 --- a/test/Modules/Inputs/merge-var-template-def/b1.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef B1_H -#define B1_H -template struct A { static bool b; }; -template bool A::b = false; -template void *get() { return &(A::b); } -#include "a.h" -#endif diff --git a/test/Modules/Inputs/merge-var-template-def/b2.h b/test/Modules/Inputs/merge-var-template-def/b2.h deleted file mode 100644 index 3c7e5303e6..0000000000 --- a/test/Modules/Inputs/merge-var-template-def/b2.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef B2_H -#define B2_H -template struct A { static bool b; }; -template bool A::b = false; -template void *get() { return &(A::b); } -#endif diff --git a/test/Modules/Inputs/merge-var-template-def/module.modulemap b/test/Modules/Inputs/merge-var-template-def/module.modulemap deleted file mode 100644 index b2c96bd821..0000000000 --- a/test/Modules/Inputs/merge-var-template-def/module.modulemap +++ /dev/null @@ -1,5 +0,0 @@ -module a { header "a.h" export * } -module b { - module b1 { header "b1.h" export * } - module b2 { header "b2.h" export * } -} diff --git a/test/Modules/merge-template-pattern-visibility.cpp b/test/Modules/merge-template-pattern-visibility.cpp index bb34d3b2a6..ec5aa26c68 100644 --- a/test/Modules/merge-template-pattern-visibility.cpp +++ b/test/Modules/merge-template-pattern-visibility.cpp @@ -7,12 +7,6 @@ // RUN: -fmodules-local-submodule-visibility -o %t/Y.pcm // RUN: %clang_cc1 -fmodules -fno-modules-error-recovery -std=c++14 -fmodule-file=%t/X.pcm -fmodule-file=%t/Y.pcm \ // RUN: -fmodules-local-submodule-visibility -verify %s -I%S/Inputs/merge-template-pattern-visibility -// RUN: %clang_cc1 -fmodules -fno-modules-error-recovery -std=c++14 -fmodule-file=%t/Y.pcm -fmodule-file=%t/X.pcm \ -// RUN: -fmodules-local-submodule-visibility -verify %s -I%S/Inputs/merge-template-pattern-visibility -// RUN: %clang_cc1 -fmodules -fno-modules-error-recovery -std=c++14 -fmodule-file=%t/X.pcm -fmodule-file=%t/Y.pcm \ -// RUN: -verify %s -I%S/Inputs/merge-template-pattern-visibility -// RUN: %clang_cc1 -fmodules -fno-modules-error-recovery -std=c++14 -fmodule-file=%t/Y.pcm -fmodule-file=%t/X.pcm \ -// RUN: -verify %s -I%S/Inputs/merge-template-pattern-visibility #include "b.h" #include "d.h" @@ -21,6 +15,4 @@ void g() { CrossModuleMerge::B bi; CrossModuleMerge::C(0); - CrossModuleMerge::D(0); - CrossModuleMerge::E e; } diff --git a/test/Modules/merge-var-template-def.cpp b/test/Modules/merge-var-template-def.cpp deleted file mode 100644 index 4d39cad310..0000000000 --- a/test/Modules/merge-var-template-def.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// RUN: rm -rf %t -// RUN: %clang_cc1 -I%S/Inputs/merge-var-template-def -verify -fmodules -Werror=undefined-internal -fmodules-local-submodule-visibility -fmodules-cache-path=%t -fimplicit-module-maps %s -// expected-no-diagnostics - -#include "b2.h" -namespace { struct X; } -void *x = get();