diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-06-26 03:54:13 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-06-26 03:54:13 +0000 |
| commit | 5f212cbb73a7cd818f2b31c78f80c1e4ac5adae3 (patch) | |
| tree | 5d9ae2d3f68d3859e08be10d907d2ef5fe5eab0a | |
| parent | e2355f70fa119f0a4d49d0284d362638630d3d17 (diff) | |
| download | bcm5719-llvm-5f212cbb73a7cd818f2b31c78f80c1e4ac5adae3.tar.gz bcm5719-llvm-5f212cbb73a7cd818f2b31c78f80c1e4ac5adae3.zip | |
Fix another assert related to using decls.
llvm-svn: 74262
| -rw-r--r-- | clang/lib/Sema/SemaLookup.cpp | 3 | ||||
| -rw-r--r-- | clang/test/SemaCXX/using-decl-1.cpp | 8 |
2 files changed, 11 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; diff --git a/clang/test/SemaCXX/using-decl-1.cpp b/clang/test/SemaCXX/using-decl-1.cpp new file mode 100644 index 00000000000..2459f251deb --- /dev/null +++ b/clang/test/SemaCXX/using-decl-1.cpp @@ -0,0 +1,8 @@ +// RUN: clang-cc -fsyntax-only -verify %s + +extern "C" { void f(bool); } + +namespace std { + using ::f; + inline void f() { return f(true); } +} |
