Author: rsmith
Date: Tue Sep 13 20:05:35 2016
New Revision: 281429
URL: http://llvm.org/viewvc/llvm-project?rev=281429&view=rev
Log:
[modules] When merging one definition into another, propagate the list of
re-exporting modules from the discarded definition to the retained definition.
Modified:
cfe/trunk/include/clang/AST/ASTContext.h
cfe/trunk/lib/AST/ASTContext.cpp
cfe/trunk/lib/Serialization/ASTReader.cpp
cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/a.h
cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/b.h
cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/c.h
cfe/trunk/test/Modules/merge-template-pattern-visibility.cpp
Modified: cfe/trunk/include/clang/AST/ASTContext.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/ASTContext.h?rev=281429&r1=281428&r2=281429&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/ASTContext.h (original)
+++ cfe/trunk/include/clang/AST/ASTContext.h Tue Sep 13 20:05:35 2016
@@ -308,10 +308,18 @@ class ASTContext : public RefCountedBase
/// merged into.
llvm::DenseMap<Decl*, Decl*> 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<Module*> 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<NamedDecl*, llvm::TinyPtrVector<Module*>> MergedDefModules;
+ llvm::DenseMap<NamedDecl*, MergedModulesOrCanonicalDef> 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
@@ -894,6 +902,7 @@ 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);
@@ -904,7 +913,9 @@ public:
auto MergedIt = MergedDefModules.find(Def);
if (MergedIt == MergedDefModules.end())
return None;
- return MergedIt->second;
+ if (auto *CanonDef = MergedIt->second.CanonicalDef)
+ return getModulesWithMergedDefinition(CanonDef);
+ return MergedIt->second.MergedModules;
}
/// Add a declaration to the list of declarations that are initialized
Modified: cfe/trunk/lib/AST/ASTContext.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=281429&r1=281428&r2=281429&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ASTContext.cpp (original)
+++ cfe/trunk/lib/AST/ASTContext.cpp Tue Sep 13 20:05:35 2016
@@ -890,10 +890,59 @@ void ASTContext::mergeDefinitionIntoModu
if (auto *Listener = getASTMutationListener())
Listener->RedefinedHiddenDefinition(ND, M);
- if (getLangOpts().ModulesLocalVisibility)
- MergedDefModules[ND].push_back(M);
- else
+ if (getLangOpts().ModulesLocalVisibility) {
+ auto *Merged = &MergedDefModules[ND];
+ if (auto *CanonDef = Merged->CanonicalDef)
+ Merged = &MergedDefModules[CanonDef];
+ Merged->MergedModules.push_back(M);
+ } else {
+ auto MergedIt = MergedDefModules.find(ND);
+ if (MergedIt != MergedDefModules.end() && MergedIt->second.CanonicalDef)
+ ND = MergedIt->second.CanonicalDef;
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);
+ 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) {
@@ -901,7 +950,13 @@ void ASTContext::deduplicateMergedDefini
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)
Modified: cfe/trunk/lib/Serialization/ASTReader.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=281429&r1=281428&r2=281429&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReader.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReader.cpp Tue Sep 13 20:05:35 2016
@@ -3474,23 +3474,10 @@ void ASTReader::makeModuleVisible(Module
/// 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.
- 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);
- }
+ getContext().mergeDefinitionIntoModulesOf(Def, MergedDef);
+ PendingMergedDefinitionsToDeduplicate.insert(Def);
}
}
@@ -8621,7 +8608,7 @@ void ASTReader::finishPendingActions() {
const FunctionDecl *Defn = nullptr;
if (!getContext().getLangOpts().Modules || !FD->hasBody(Defn))
FD->setLazyBody(PB->second);
- else
+ else if (FD != Defn)
mergeDefinitionVisibility(const_cast<FunctionDecl*>(Defn), FD);
continue;
}
Modified: cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/a.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/a.h?rev=281429&r1=281428&r2=281429&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/a.h
(original)
+++ cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/a.h Tue Sep
13 20:05:35 2016
@@ -4,3 +4,7 @@ template<typename T> struct B;
template<typename, typename> struct A {};
template<typename T> struct B : A<T> {};
template<typename T> inline auto C(T) {}
+
+namespace CrossModuleMerge {
+ template<typename T> inline auto D(T) {}
+}
Modified: cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/b.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/b.h?rev=281429&r1=281428&r2=281429&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/b.h
(original)
+++ cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/b.h Tue Sep
13 20:05:35 2016
@@ -17,4 +17,6 @@ namespace CrossModuleMerge {
template<typename, typename> struct A {};
template<typename T> struct B : A<T> {};
template<typename T> inline auto C(T) {}
+
+ template<typename T> inline auto D(T) {}
}
Modified: cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/c.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/c.h?rev=281429&r1=281428&r2=281429&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/c.h
(original)
+++ cfe/trunk/test/Modules/Inputs/merge-template-pattern-visibility/c.h Tue Sep
13 20:05:35 2016
@@ -5,5 +5,7 @@ namespace CrossModuleMerge {
template<typename, typename> struct A {};
template<typename T> struct B : A<T> {};
template<typename T> inline auto C(T) {}
+
+ template<typename T> inline auto D(T) {}
}
Modified: cfe/trunk/test/Modules/merge-template-pattern-visibility.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/merge-template-pattern-visibility.cpp?rev=281429&r1=281428&r2=281429&view=diff
==============================================================================
--- cfe/trunk/test/Modules/merge-template-pattern-visibility.cpp (original)
+++ cfe/trunk/test/Modules/merge-template-pattern-visibility.cpp Tue Sep 13
20:05:35 2016
@@ -7,6 +7,8 @@
// 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
#include "b.h"
#include "d.h"
@@ -15,4 +17,5 @@
void g() {
CrossModuleMerge::B<int> bi;
CrossModuleMerge::C(0);
+ CrossModuleMerge::D(0);
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
