When performing typo correction, keep track of whether the last lookup
we did was an acceptable lookup. If it is, then we can re-use that
lookup result. If it isn't, we have to perform the lookup again. This
is almost surely the cause behind the mysterious typo.m failures on
some builders; we were getting the wrong lookup results returned.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116586 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 9056e79..6cd0207 100644
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -3051,6 +3051,7 @@
return DeclarationName();
// Weed out any names that could not be found by name lookup.
+ bool LastLookupWasAccepted = false;
for (TypoCorrectionConsumer::iterator I = Consumer.begin(),
IEnd = Consumer.end();
I != IEnd; /* Increment in loop. */) {
@@ -3103,12 +3104,14 @@
Consumer.erase(I);
I = Next;
}
+ LastLookupWasAccepted = false;
break;
case LookupResult::Found:
case LookupResult::FoundOverloaded:
case LookupResult::FoundUnresolvedValue:
++I;
+ LastLookupWasAccepted = false;
break;
}
@@ -3121,8 +3124,41 @@
}
// If only a single name remains, return that result.
- if (Consumer.size() == 1)
+ if (Consumer.size() == 1) {
+ IdentifierInfo *Name = &Context.Idents.get(Consumer.begin()->getKey());
+ if (!LastLookupWasAccepted) {
+ // Perform name lookup on this name.
+ Res.suppressDiagnostics();
+ Res.clear();
+ Res.setLookupName(Name);
+ if (MemberContext)
+ LookupQualifiedName(Res, MemberContext);
+ else {
+ LookupParsedName(Res, S, SS, /*AllowBuiltinCreation=*/false,
+ EnteringContext);
+
+ // Fake ivar lookup; this should really be part of
+ // LookupParsedName.
+ if (ObjCMethodDecl *Method = getCurMethodDecl()) {
+ if (Method->isInstanceMethod() && Method->getClassInterface() &&
+ (Res.empty() ||
+ (Res.isSingleResult() &&
+ Res.getFoundDecl()->isDefinedOutsideFunctionOrMethod()))) {
+ ObjCInterfaceDecl *ClassDeclared = 0;
+ if (ObjCIvarDecl *IV
+ = Method->getClassInterface()->lookupInstanceVariable(Name,
+ ClassDeclared)) {
+ Res.clear();
+ Res.addDecl(IV);
+ Res.resolveKind();
+ }
+ }
+ }
+ }
+ }
+
return &Context.Idents.get(Consumer.begin()->getKey());
+ }
else if (Consumer.size() > 1 && CTC == CTC_ObjCMessageReceiver
&& Consumer["super"]) {
// Prefix 'super' when we're completing in a message-receiver