1 files changed, 1 insertions, 9 deletions
diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 70dca799ae..d736d42f77 100644
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -254,7 +254,6 @@ void Sema::LookupResult::resolveKind() {
 
   bool Ambiguous = false;
   bool HasTag = false, HasFunction = false, HasNonFunction = false;
-  bool HasUnresolved = false;
 
   unsigned UniqueTagIndex = 0;
   
@@ -268,7 +267,7 @@ void Sema::LookupResult::resolveKind() {
       // continue at this index).
       Decls[I] = Decls[--N];
     } else if (isa<UnresolvedUsingDecl>(D)) {
-      HasUnresolved = true;
+      // FIXME: support unresolved using decls
       Decls[I] = Decls[--N];
     } else {
       // Otherwise, do some decl type analysis and then continue.
@@ -288,13 +287,6 @@ void Sema::LookupResult::resolveKind() {
     }
   }
 
-  // Postpone all other decisions if we have an unresolved decl, even
-  // if we can prove ambiguity.  We can probably do better than this.
-  if (HasUnresolved) {
-    ResultKind = LookupResult::FoundOverloaded;
-    return;
-  }
-
   // C++ [basic.scope.hiding]p2:
   //   A class name or enumeration name can be hidden by the name of
   //   an object, function, or enumerator declared in the same