diff options
author | John McCall <rjmccall@apple.com> | 2010-01-15 21:27:01 +0000 |
---|---|---|
committer | John McCall <rjmccall@apple.com> | 2010-01-15 21:27:01 +0000 |
commit | dc5c78639f4e64d790c08e7b6494ae86ceea4ff1 (patch) | |
tree | fe961b5609b02bbb9de0144c145cec19b8f3a7de /lib/Sema/SemaLookup.cpp | |
parent | 16c440a377b7ec8b722a2e2c7c864f75c95bd305 (diff) |
Make LookupResult::resolveKind() robust against NotFoundInCurrentInstantiation.
Fixes PR 6049.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@93557 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaLookup.cpp')
-rw-r--r-- | lib/Sema/SemaLookup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp index cda245deba..70baefdae7 100644 --- a/lib/Sema/SemaLookup.cpp +++ b/lib/Sema/SemaLookup.cpp @@ -317,7 +317,7 @@ void LookupResult::resolveKind() { // Fast case: no possible ambiguity. if (N == 0) { - assert(ResultKind == NotFound); + assert(ResultKind == NotFound || ResultKind == NotFoundInCurrentInstantiation); return; } |