diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-02-07 03:30:24 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-02-07 03:30:24 +0000 |
| commit | 3646c68676c3c46a026b23d52188ef6e0d856178 (patch) | |
| tree | e95e24d1132aca61782501a9c433cfbce948dc43 /lib/AST/DeclBase.cpp | |
| parent | 878d0ad2c9d83ee6485fd16e21c5082acc63a890 (diff) | |
Simplify FindExternalVisibleDeclsByName by making it return a bool indicating
if it found any decls, rather than returning a list of found decls. This
removes a returning-ArrayRef-to-deleted-storage bug from
MultiplexExternalSemaSource (in code not exercised by any of the clang
binaries), reduces the work required in the found-no-decls case with PCH, and
importantly removes the need for DeclContext::lookup to be reentrant.
No functionality change intended!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174576 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/DeclBase.cpp')
| -rw-r--r-- | lib/AST/DeclBase.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp index 27a91cb7e6..52ecdeb318 100644 --- a/lib/AST/DeclBase.cpp +++ b/lib/AST/DeclBase.cpp @@ -1186,7 +1186,15 @@ DeclContext::lookup(DeclarationName Name) { } ExternalASTSource *Source = getParentASTContext().getExternalSource(); - return Source->FindExternalVisibleDeclsByName(this, Name); + if (Source->FindExternalVisibleDeclsByName(this, Name)) { + if (StoredDeclsMap *Map = LookupPtr.getPointer()) { + StoredDeclsMap::iterator I = Map->find(Name); + if (I != Map->end()) + return I->second.getLookupResult(); + } + } + + return lookup_result(lookup_iterator(0), lookup_iterator(0)); } StoredDeclsMap *Map = LookupPtr.getPointer(); |