Eliminate another ordering dependency in typo correction. Re-enable typo.m, which seems to be working properly.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116894 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 060274e0d8..ab810a4682 100644
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -3138,7 +3138,10 @@ DeclarationName Sema::CorrectTypo(LookupResult &Res, Scope *S, CXXScopeSpec *SS,
   // If only a single name remains, return that result.
   if (Consumer.size() == 1) {
     IdentifierInfo *Name = &Context.Idents.get(Consumer.begin()->getKey());
-    if (!LastLookupWasAccepted) {
+    if (Consumer.begin()->second) {
+      Res.suppressDiagnostics();
+      Res.clear();
+    } else if (!LastLookupWasAccepted) {
       // Perform name lookup on this name.
       Res.suppressDiagnostics();
       Res.clear();