Use UnsignedOrNone

Author: zyn0217

clang/lib/Sema/SemaConcept.cpp

@@ -1064,7 +1064,7 @@ static bool CheckFunctionConstraintsWithoutInstantiation(
     Sema &SemaRef, SourceLocation PointOfInstantiation,
     FunctionTemplateDecl *Template, ArrayRef<TemplateArgument> TemplateArgs,
     ConstraintSatisfaction &Satisfaction) {
-  SmallVector<const Expr *, 3> TemplateAC;
+  SmallVector<AssociatedConstraint, 3> TemplateAC;
   Template->getAssociatedConstraints(TemplateAC);
   if (TemplateAC.empty()) {
     Satisfaction.IsSatisfied = true;

clang/lib/Sema/SemaTemplateInstantiate.cpp

@@ -1989,9 +1989,9 @@ bool TemplateInstantiator::maybeInstantiateFunctionParameterToScope(
 
   bool ShouldExpand = false;
   bool RetainExpansion = false;
-  std::optional<unsigned> OrigNumExpansions =
+  UnsignedOrNone OrigNumExpansions =
       ExpansionTL.getTypePtr()->getNumExpansions();
-  std::optional<unsigned> NumExpansions = OrigNumExpansions;
+  UnsignedOrNone NumExpansions = OrigNumExpansions;
   if (TryExpandParameterPacks(ExpansionTL.getEllipsisLoc(),
                               Pattern.getSourceRange(), Unexpanded,
                               ShouldExpand, RetainExpansion, NumExpansions))
@@ -2001,7 +2001,7 @@ bool TemplateInstantiator::maybeInstantiateFunctionParameterToScope(
          "Shouldn't preserve pack expansion when evaluating constraints");
   ExpandingFunctionParameterPack(OldParm);
   for (unsigned I = 0; I != *NumExpansions; ++I) {
-    Sema::ArgumentPackSubstitutionIndexRAII SubstIndex(getSema(), I);
+    Sema::ArgPackSubstIndexRAII SubstIndex(getSema(), I);
     if (!TransformFunctionTypeParam(OldParm, /*indexAdjustment=*/0,
                                     /*NumExpansions=*/OrigNumExpansions,
                                     /*ExpectParameterPack=*/false))

clang/test/SemaCXX/overload-resolution-deferred-templates.cpp

@@ -173,7 +173,7 @@ void f(int);
 void g(int n) { f(n); } // OK
 void h(short n) { f(n); }
 // expected-error@#GH62096-err {{static assertion failed due to requirement 'sizeof(short) == 0'}} \
-// expected-note@-1{{in instantiation of function template specialization}} \
+// expected-note@-1{{while substituting deduced template arguments}} \
 // expected-note@-1{{while checking constraint satisfaction for template}}
 // expected-note@#GH62096-note1{{in instantiation}}
 // expected-note@#GH62096-note1{{while substituting template arguments into constraint expression here}}

clang/test/SemaTemplate/deduction-guide.cpp

@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -std=c++2a -verify -ast-dump -ast-dump-decl-types -ast-dump-filter "deduction guide" %s | FileCheck %s --strict-whitespace -dump-input=always
+// RUN: %clang_cc1 -std=c++2a -verify -ast-dump -ast-dump-decl-types -ast-dump-filter "deduction guide" %s | FileCheck %s --strict-whitespace
 
 template<auto ...> struct X {};
 template<template<typename X, X> typename> struct Y {};
@@ -234,7 +234,7 @@ F s(0);
 // CHECK: | `-CXXBoolLiteralExpr {{.*}} 'bool' false
 // CHECK: |-CXXDeductionGuideDecl {{.*}} implicit <deduction guide for F> 'auto (U) -> F<value-parameter-0-0>'
 // CHECK: | `-ParmVarDecl {{.*}} 'U'
-// CHECK: `-CXXDeductionGuideDecl {{.*}} implicit <deduction guide for F> 'auto (int) -> F<>'
+// CHECK: `-CXXDeductionGuideDecl {{.*}} implicit used <deduction guide for F> 'auto (int) -> F<>'
 // CHECK:   |-TemplateArgument integral ''x''
 // CHECK:   |-TemplateArgument type 'int'
 // CHECK:   | `-BuiltinType {{.*}} 'int'