From f5bd02d290ff15268853e0456c130a1afa15e907 Mon Sep 17 00:00:00 2001
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Thu, 19 Nov 2009 09:00:00 +0000
Subject: Update clang to r89337.

---
 lib/Sema/SemaLookup.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/Sema/SemaLookup.cpp')

diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 1f49b789d3f0..1957d7ff11b7 100644
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -246,7 +246,11 @@ void LookupResult::resolveKind() {
   unsigned N = Decls.size();
 
   // Fast case: no possible ambiguity.
-  if (N == 0) return;
+  if (N == 0) {
+    assert(ResultKind == NotFound);
+    return;
+  }
+
   if (N == 1) {
     if (isa<UnresolvedUsingValueDecl>(Decls[0]))
       ResultKind = FoundUnresolvedValue;
-- 
cgit v1.2.3