summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaLookup.cpp
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2009-06-26 03:54:13 +0000
committerAnders Carlsson <andersca@mac.com>2009-06-26 03:54:13 +0000
commit5f212cbb73a7cd818f2b31c78f80c1e4ac5adae3 (patch)
tree5d9ae2d3f68d3859e08be10d907d2ef5fe5eab0a /clang/lib/Sema/SemaLookup.cpp
parente2355f70fa119f0a4d49d0284d362638630d3d17 (diff)
downloadbcm5719-llvm-5f212cbb73a7cd818f2b31c78f80c1e4ac5adae3.tar.gz
bcm5719-llvm-5f212cbb73a7cd818f2b31c78f80c1e4ac5adae3.zip
Fix another assert related to using decls.
llvm-svn: 74262
Diffstat (limited to 'clang/lib/Sema/SemaLookup.cpp')
-rw-r--r--clang/lib/Sema/SemaLookup.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp
index 4d25f5b4804..0d5c54530a3 100644
--- a/clang/lib/Sema/SemaLookup.cpp
+++ b/clang/lib/Sema/SemaLookup.cpp
@@ -212,6 +212,9 @@ MergeLookupResults(ASTContext &Context, LookupResultsTy &Results) {
case LResult::Found: {
NamedDecl *ND = I->getAsDecl();
+ if (UsingDecl *UD = dyn_cast<UsingDecl>(ND))
+ ND = UD->getTargetDecl();
+
if (TagDecl *TD = dyn_cast<TagDecl>(ND)) {
TagFound = Context.getCanonicalDecl(TD);
TagNames += FoundDecls.insert(TagFound)? 1 : 0;
OpenPOWER on IntegriCloud