diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-08-13 01:23:33 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-08-13 01:23:33 +0000 |
| commit | bb853c79c0d61acaa0dd9aa4f77cded334166946 (patch) | |
| tree | 03f13744f52312d2161759fb54b25fbe8219e3ae /clang/lib/AST/DeclBase.cpp | |
| parent | 46ef7ce2833f2efffc009d3a657c2c4f8f3569ea (diff) | |
| download | bcm5719-llvm-bb853c79c0d61acaa0dd9aa4f77cded334166946.tar.gz bcm5719-llvm-bb853c79c0d61acaa0dd9aa4f77cded334166946.zip | |
[modules] When performing a lookup into a namespace, ensure that any later
redefinitions of that namespace have already been loaded. When writing out the
names in a namespace, if we see a name that is locally declared and had
imported declarations merged on top of it, export the local declaration as the
lookup result, because it will be the most recent declaration of that entity in
the redeclaration chain of an importer of the module.
llvm-svn: 215518
Diffstat (limited to 'clang/lib/AST/DeclBase.cpp')
| -rw-r--r-- | clang/lib/AST/DeclBase.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp index 2b1506d191d..49d05d0d407 100644 --- a/clang/lib/AST/DeclBase.cpp +++ b/clang/lib/AST/DeclBase.cpp @@ -1296,6 +1296,11 @@ DeclContext::lookup(DeclarationName Name) { if (PrimaryContext != this) return PrimaryContext->lookup(Name); + // If this is a namespace, ensure that any later redeclarations of it have + // been loaded, since they may add names to the result of this lookup. + if (auto *ND = dyn_cast<NamespaceDecl>(this)) + (void)ND->getMostRecentDecl(); + if (hasExternalVisibleStorage()) { if (NeedToReconcileExternalVisibleStorage) reconcileExternalVisibleStorage(); |
