Format

Author: cor3ntin

clang/include/clang/Sema/SemaConcept.h

@@ -287,11 +287,11 @@ class NormalizedConstraintWithParamMapping : public NormalizedConstraint {
 
 public:
   using NormalizedConstraint::getParameterMapping;
+  using NormalizedConstraint::getUsedTemplateParamList;
   using NormalizedConstraint::hasMatchingParameterMapping;
   using NormalizedConstraint::hasParameterMapping;
   using NormalizedConstraint::mappingOccurenceList;
   using NormalizedConstraint::updateParameterMapping;
-  using NormalizedConstraint::getUsedTemplateParamList;
 
   const NamedDecl *getConstraintDecl() const { return Atomic.ConstraintDecl; }
 

clang/lib/Sema/SemaConcept.cpp

@@ -549,7 +549,7 @@ static bool calculateConstraintSatisfaction(
   if (!NumExpansions)
     return false;
 
-  if(*NumExpansions == 0) {
+  if (*NumExpansions == 0) {
     Satisfaction.IsSatisfied = Conjunction;
     return true;
   }
@@ -566,7 +566,8 @@ static bool calculateConstraintSatisfaction(
     if (!Success && Conjunction)
       return false;
     if (!Conjunction && Satisfaction.IsSatisfied) {
-      Satisfaction.Details.erase(Satisfaction.Details.begin() + EffectiveDetailEndIndex,
+      Satisfaction.Details.erase(Satisfaction.Details.begin() +
+                                     EffectiveDetailEndIndex,
                                  Satisfaction.Details.end());
       break;
     }
@@ -664,19 +665,22 @@ static bool calculateConstraintSatisfaction(
 
   auto EffectiveDetailEndIndex = Satisfaction.Details.size();
 
-  bool Conjunction = Constraint.getCompoundKind() == NormalizedConstraint::CCK_Conjunction;
+  bool Conjunction =
+      Constraint.getCompoundKind() == NormalizedConstraint::CCK_Conjunction;
 
   bool Ok = calculateConstraintSatisfaction(
       S, Constraint.getLHS(), Template, TemplateNameLoc, MLTAL, Satisfaction,
       PackSubstitutionIndex);
 
-  if(Conjunction && !Ok)
+  if (Conjunction && !Ok)
     return false;
 
-  if (!Conjunction && Ok && Satisfaction.IsSatisfied && !Satisfaction.ContainsErrors)
+  if (!Conjunction && Ok && Satisfaction.IsSatisfied &&
+      !Satisfaction.ContainsErrors)
     return true;
 
-  if (Conjunction && Ok && (!Satisfaction.IsSatisfied || Satisfaction.ContainsErrors))
+  if (Conjunction && Ok &&
+      (!Satisfaction.IsSatisfied || Satisfaction.ContainsErrors))
     return true;
 
   Satisfaction.ContainsErrors = false;
@@ -686,7 +690,8 @@ static bool calculateConstraintSatisfaction(
                                          TemplateNameLoc, MLTAL, Satisfaction,
                                          PackSubstitutionIndex);
   if (Ok && Satisfaction.IsSatisfied && !Satisfaction.ContainsErrors)
-    Satisfaction.Details.erase(Satisfaction.Details.begin() + EffectiveDetailEndIndex,
+    Satisfaction.Details.erase(Satisfaction.Details.begin() +
+                                   EffectiveDetailEndIndex,
                                Satisfaction.Details.end());
   return Ok;
 }
@@ -1397,9 +1402,10 @@ static void diagnoseUnsatisfiedRequirement(Sema &S,
                                            concepts::NestedRequirement *Req,
                                            bool First) {
   DiagnoseUnsatisfiedConstraint(S, Req->getConstraintSatisfaction().records(),
-                                Req->hasInvalidConstraint() ? SourceLocation() :
-                                Req->getConstraintExpr()->getExprLoc(), First,
-                                Req);
+                                Req->hasInvalidConstraint()
+                                    ? SourceLocation()
+                                    : Req->getConstraintExpr()->getExprLoc(),
+                                First, Req);
 }
 
 static void diagnoseWellFormedUnsatisfiedConstraintExpr(Sema &S,

clang/lib/Sema/SemaTemplate.cpp

@@ -5987,9 +5987,11 @@ bool Sema::CheckTemplateArgumentList(
       // For constraint parameter mapping, we have already built a pack in
       // TransformTemplateArguments
       // if (inParameterMappingSubstitution()) {
-      //   llvm::copy(SugaredArgumentPack, std::back_inserter(CTAI.SugaredConverted));
+      //   llvm::copy(SugaredArgumentPack,
+      //   std::back_inserter(CTAI.SugaredConverted));
       //   SugaredArgumentPack.clear();
-      //   llvm::copy(CanonicalArgumentPack, std::back_inserter(CTAI.CanonicalConverted));
+      //   llvm::copy(CanonicalArgumentPack,
+      //   std::back_inserter(CTAI.CanonicalConverted));
       //   CanonicalArgumentPack.clear();
       //   ++Param;
       //   continue;