Fix alias-template-with-lambdas.cpp

Author: cor3ntin

clang/include/clang/Sema/Template.h

@@ -261,7 +261,8 @@ enum class TemplateSubstitutionKind : char {
       //         ==
       //             AssociatedDecl) &&
       //        "Trying to change incorrect declaration?");
-      TemplateArgumentLists.back().AssociatedDeclAndFinal.setPointer(AssociatedDecl);
+      TemplateArgumentLists.back().AssociatedDeclAndFinal.setPointer(
+          AssociatedDecl);
       TemplateArgumentLists.back().Args = Args;
     }
 

clang/lib/Sema/SemaConcept.cpp

@@ -593,7 +593,9 @@ static bool calculateConstraintSatisfaction(
 
     Sema::SFINAETrap Trap(S);
     Sema::ArgPackSubstIndexRAII SubstIndex(
-        S, Constraint.getPackSubstitutionIndex());
+        S, Constraint.getPackSubstitutionIndex()
+               ? Constraint.getPackSubstitutionIndex()
+               : PackSubstitutionIndex);
 
     const ASTTemplateArgumentListInfo *Ori =
         Constraint.getConceptId()->getTemplateArgsAsWritten();
@@ -1750,9 +1752,8 @@ NormalizedConstraint *NormalizedConstraint::fromConstraintExpr(
     if (substituteParameterMappings(S, *SubNF, CSE))
       return nullptr;
 
-    return ConceptIdConstraint::Create(S.getASTContext(),
-                                       CSE->getConceptReference(), SubNF, D,
-                                       SubstIndex);
+    return ConceptIdConstraint::Create(
+        S.getASTContext(), CSE->getConceptReference(), SubNF, D, SubstIndex);
 
   } else if (auto *FE = dyn_cast<const CXXFoldExpr>(E);
              FE && S.getLangOpts().CPlusPlus26 &&

clang/lib/Sema/SemaTemplateInstantiate.cpp

@@ -2233,7 +2233,8 @@ TemplateInstantiator::TransformTemplateParmRefExpr(DeclRefExpr *E,
     if (Arg.getKind() != TemplateArgument::Expression) {
       assert(SemaRef.inParameterMappingSubstitution());
       // FIXME: SourceLocation()?
-      ExprResult E = SemaRef.BuildExpressionFromNonTypeTemplateArgument(Arg, SourceLocation());
+      ExprResult E = SemaRef.BuildExpressionFromNonTypeTemplateArgument(
+          Arg, SourceLocation());
       if (E.isInvalid())
         return E;
       Arg = TemplateArgument(E.get(), /*IsCanonical=*/false);