summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2010-01-15 21:27:01 +0000
committerJohn McCall <rjmccall@apple.com>2010-01-15 21:27:01 +0000
commit7fe6e9c2f1d1eb41a9887adcadedc2a06d1b1fbe (patch)
tree4027ab0be582aae45934f775aeda972561fef190
parenta6450df92a398ac249072e21102bf23474cd83ac (diff)
downloadbcm5719-llvm-7fe6e9c2f1d1eb41a9887adcadedc2a06d1b1fbe.tar.gz
bcm5719-llvm-7fe6e9c2f1d1eb41a9887adcadedc2a06d1b1fbe.zip
Make LookupResult::resolveKind() robust against NotFoundInCurrentInstantiation.
Fixes PR 6049. llvm-svn: 93557
-rw-r--r--clang/lib/Sema/SemaLookup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp
index cda245deba1..70baefdae77 100644
--- a/clang/lib/Sema/SemaLookup.cpp
+++ b/clang/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;
}
OpenPOWER on IntegriCloud