[cfe-commits] r93557 - /cfe/trunk/lib/Sema/SemaLookup.cpp

[John McCall]

Author: rjmccall
Date: Fri Jan 15 15:27:01 2010
New Revision: 93557

URL: http://llvm.org/viewvc/llvm-project?rev=93557&view=rev
Log:
Make LookupResult::resolveKind() robust against NotFoundInCurrentInstantiation.
Fixes PR 6049.


Modified:
    cfe/trunk/lib/Sema/SemaLookup.cpp

Modified: cfe/trunk/lib/Sema/SemaLookup.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaLookup.cpp?rev=93557&r1=93556&r2=93557&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaLookup.cpp (original)
+++ cfe/trunk/lib/Sema/SemaLookup.cpp Fri Jan 15 15:27:01 2010
@@ -317,7 +317,7 @@
  
   // Fast case: no possible ambiguity.
   if (N == 0) {
-    assert(ResultKind == NotFound);
+    assert(ResultKind == NotFound || ResultKind == NotFoundInCurrentInstantiation);
     return;
   }