Skip to content

Commit 51bf929

Browse files
committed
Revert capitalize changes
1 parent f0d65ac commit 51bf929

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

clang/lib/Sema/SemaConcept.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ std::optional<MultiLevelTemplateArgumentList>
565565
ConstraintSatisfactionChecker::SubstitutionInTemplateArguments(
566566
const NormalizedConstraintWithParamMapping &Constraint,
567567
MultiLevelTemplateArgumentList MLTAL,
568-
llvm::SmallVector<TemplateArgument> &SubstitutedOutermost) {
568+
llvm::SmallVector<TemplateArgument> &SubstitutedOuterMost) {
569569

570570
if (!Constraint.hasParameterMapping())
571571
return std::move(MLTAL);
@@ -607,27 +607,27 @@ ConstraintSatisfactionChecker::SubstitutionInTemplateArguments(
607607
// The empty MLTAL situation should only occur when evaluating non-dependent
608608
// constraints.
609609
if (MLTAL.getNumSubstitutedLevels())
610-
SubstitutedOutermost =
610+
SubstitutedOuterMost =
611611
llvm::to_vector_of<TemplateArgument>(MLTAL.getOutermost());
612612
unsigned Offset = 0;
613613
for (unsigned I = 0, MappedIndex = 0; I < Used.size(); I++) {
614614
TemplateArgument Arg;
615615
if (Used[I])
616616
Arg = S.Context.getCanonicalTemplateArgument(
617617
CTAI.SugaredConverted[MappedIndex++]);
618-
if (I < SubstitutedOutermost.size()) {
619-
SubstitutedOutermost[I] = Arg;
618+
if (I < SubstitutedOuterMost.size()) {
619+
SubstitutedOuterMost[I] = Arg;
620620
Offset = I + 1;
621621
} else {
622-
SubstitutedOutermost.push_back(Arg);
623-
Offset = SubstitutedOutermost.size();
622+
SubstitutedOuterMost.push_back(Arg);
623+
Offset = SubstitutedOuterMost.size();
624624
}
625625
}
626-
if (Offset < SubstitutedOutermost.size())
627-
SubstitutedOutermost.erase(SubstitutedOutermost.begin() + Offset);
626+
if (Offset < SubstitutedOuterMost.size())
627+
SubstitutedOuterMost.erase(SubstitutedOuterMost.begin() + Offset);
628628

629629
MultiLevelTemplateArgumentList SubstitutedTemplateArgs;
630-
SubstitutedTemplateArgs.addOuterTemplateArguments(TD, SubstitutedOutermost,
630+
SubstitutedTemplateArgs.addOuterTemplateArguments(TD, SubstitutedOuterMost,
631631
/*Final=*/false);
632632
return std::move(SubstitutedTemplateArgs);
633633
}
@@ -636,9 +636,9 @@ ExprResult ConstraintSatisfactionChecker::EvaluateSlow(
636636
const AtomicConstraint &Constraint,
637637
const MultiLevelTemplateArgumentList &MLTAL) {
638638

639-
llvm::SmallVector<TemplateArgument> SubstitutedOutermost;
639+
llvm::SmallVector<TemplateArgument> SubstitutedOuterMost;
640640
std::optional<MultiLevelTemplateArgumentList> SubstitutedArgs =
641-
SubstitutionInTemplateArguments(Constraint, MLTAL, SubstitutedOutermost);
641+
SubstitutionInTemplateArguments(Constraint, MLTAL, SubstitutedOuterMost);
642642
if (!SubstitutedArgs) {
643643
Satisfaction.IsSatisfied = false;
644644
return ExprEmpty();
@@ -786,13 +786,13 @@ ExprResult ConstraintSatisfactionChecker::EvaluateSlow(
786786
FoldExpandedConstraint::FoldOperatorKind::And;
787787
unsigned EffectiveDetailEndIndex = Satisfaction.Details.size();
788788

789-
llvm::SmallVector<TemplateArgument> SubstitutedOutermost;
789+
llvm::SmallVector<TemplateArgument> SubstitutedOuterMost;
790790
// FIXME: Is PackSubstitutionIndex correct?
791791
llvm::SaveAndRestore _(PackSubstitutionIndex, S.ArgPackSubstIndex);
792792
std::optional<MultiLevelTemplateArgumentList> SubstitutedArgs =
793793
SubstitutionInTemplateArguments(
794794
static_cast<const NormalizedConstraintWithParamMapping &>(Constraint),
795-
MLTAL, SubstitutedOutermost);
795+
MLTAL, SubstitutedOuterMost);
796796
if (!SubstitutedArgs) {
797797
Satisfaction.IsSatisfied = false;
798798
return ExprError();
@@ -880,9 +880,9 @@ ExprResult ConstraintSatisfactionChecker::EvaluateSlow(
880880
const MultiLevelTemplateArgumentList &MLTAL, unsigned Size) {
881881
const ConceptReference *ConceptId = Constraint.getConceptId();
882882

883-
llvm::SmallVector<TemplateArgument> SubstitutedOutermost;
883+
llvm::SmallVector<TemplateArgument> SubstitutedOuterMost;
884884
std::optional<MultiLevelTemplateArgumentList> SubstitutedArgs =
885-
SubstitutionInTemplateArguments(Constraint, MLTAL, SubstitutedOutermost);
885+
SubstitutionInTemplateArguments(Constraint, MLTAL, SubstitutedOuterMost);
886886

887887
if (!SubstitutedArgs) {
888888
Satisfaction.IsSatisfied = false;

0 commit comments

Comments
 (0)