diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-01-11 22:40:45 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-01-11 22:40:45 +0000 |
| commit | 277d280c20d4414d61e307789949bef8ee3063fd (patch) | |
| tree | 2e55d75b9e7c2e4d84f44a42435b46f7e76f13a2 | |
| parent | 004f81f8d1ec38047dba4d198311d31ccc8dd94d (diff) | |
When performing name lookup into a scope, check that its entity is
non-NULL before looking at the entity itself.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@93199 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaLookup.cpp | 2 | ||||
| -rw-r--r-- | test/SemaTemplate/function-template-specialization.cpp | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp index a8c2366c59..bff7881eb6 100644 --- a/lib/Sema/SemaLookup.cpp +++ b/lib/Sema/SemaLookup.cpp @@ -648,7 +648,7 @@ bool Sema::CppLookupName(LookupResult &R, Scope *S) { for (; S; S = S->getParent()) { DeclContext *Ctx = static_cast<DeclContext *>(S->getEntity()); - if (Ctx->isTransparentContext()) + if (!Ctx || Ctx->isTransparentContext()) continue; assert(Ctx && Ctx->isFileContext() && diff --git a/test/SemaTemplate/function-template-specialization.cpp b/test/SemaTemplate/function-template-specialization.cpp index 91989b1cca..9afc99fe7d 100644 --- a/test/SemaTemplate/function-template-specialization.cpp +++ b/test/SemaTemplate/function-template-specialization.cpp @@ -33,3 +33,11 @@ template<> void f2<double>(double (&array)[42]); template<> void f2<42>(double (&array)[42]); void f2<25>(double (&array)[25]); // expected-error{{specialization}} + +// PR5833 +namespace PR5833 { + template <typename T> bool f0(T &t1); + template <> bool f0<float>(float &t1); +} +template <> bool PR5833::f0<float>(float &t1) {} + |