[FOLD]

Author: sdkrystian

clang/lib/Sema/SemaExpr.cpp

@@ -2776,8 +2776,7 @@ Sema::ActOnIdExpression(Scope *S, CXXScopeSpec &SS,
                            &AssumedTemplate))
       return ExprError();
 
-    if (MemberOfUnknownSpecialization ||
-        (R.getResultKind() == LookupResult::NotFoundInCurrentInstantiation))
+    if (R.wasNotFoundInCurrentInstantiation())
       return ActOnDependentIdExpression(SS, TemplateKWLoc, NameInfo,
                                         IsAddressOfOperand, TemplateArgs);
   } else {

clang/lib/Sema/SemaExprMember.cpp

@@ -704,16 +704,13 @@ static bool LookupMemberExprInRecord(Sema &SemaRef, LookupResult &R,
   QualType ObjectType = SS.isSet() ? QualType() : RTy;
   if (HasTemplateArgs || TemplateKWLoc.isValid()) {
     bool MOUS;
-    bool Invalid = SemaRef.LookupTemplateName(R,
+    return SemaRef.LookupTemplateName(R,
                                       /*S=*/nullptr,
                                       SS,
                                       ObjectType,
                                       /*EnteringContext=*/false,
                                       MOUS,
                                       TemplateKWLoc);
-    if (MOUS)
-      R.setNotFoundInCurrentInstantiation();
-    return Invalid;
   }
   #if 1
   SemaRef.LookupParsedName(R, /*S=*/nullptr, &SS, ObjectType);

clang/lib/Sema/SemaTemplate.cpp

@@ -213,6 +213,7 @@ TemplateNameKind Sema::isTemplateName(Scope *S,
                          &AssumedTemplate,
                          /*AllowTypoCorrection=*/!Disambiguation))
     return TNK_Non_template;
+  MemberOfUnknownSpecialization = R.wasNotFoundInCurrentInstantiation();
 
   if (AssumedTemplate != AssumedTemplateKind::None) {
     TemplateResult = TemplateTy::make(Context.getAssumedTemplateName(TName));
@@ -558,6 +559,7 @@ bool Sema::LookupTemplateName(LookupResult &Found,
   if (Found.empty()) {
     if (IsDependent) {
       MemberOfUnknownSpecialization = true;
+      Found.setNotFoundInCurrentInstantiation();
       return false;
     }