Skip to content

[Clang][NFC] Concepts normalization cleanups #164229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2025
Merged

[Clang][NFC] Concepts normalization cleanups #164229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/lib/AST/ASTConcept.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ void ConstraintSatisfaction::Profile(llvm::FoldingSetNodeID &ID,
ID.AddPointer(ConstraintOwner);
ID.AddInteger(TemplateArgs.size());
for (auto &Arg : TemplateArgs)
Arg.Profile(ID, C);
C.getCanonicalTemplateArgument(Arg).Profile(ID, C);
}

ConceptReference *
Expand Down
27 changes: 15 additions & 12 deletions clang/lib/Sema/SemaConcept.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,8 +736,9 @@ ExprResult ConstraintSatisfactionChecker::Evaluate(
UnsubstitutedConstraintSatisfactionCacheResult Cache;
Cache.Satisfaction.ContainsErrors = Satisfaction.ContainsErrors;
Cache.Satisfaction.IsSatisfied = Satisfaction.IsSatisfied;
std::copy(Satisfaction.Details.begin() + Size, Satisfaction.Details.end(),
std::back_inserter(Cache.Satisfaction.Details));
Cache.Satisfaction.Details.insert(Cache.Satisfaction.Details.end(),
Satisfaction.Details.begin() + Size,
Satisfaction.Details.end());
Cache.SubstExpr = E;
S.UnsubstitutedConstraintSatisfactionCache.insert({ID, std::move(Cache)});

Expand Down Expand Up @@ -868,8 +869,9 @@ ExprResult ConstraintSatisfactionChecker::Evaluate(
UnsubstitutedConstraintSatisfactionCacheResult Cache;
Cache.Satisfaction.ContainsErrors = Satisfaction.ContainsErrors;
Cache.Satisfaction.IsSatisfied = Satisfaction.IsSatisfied;
std::copy(Satisfaction.Details.begin() + Size, Satisfaction.Details.end(),
std::back_inserter(Cache.Satisfaction.Details));
Cache.Satisfaction.Details.insert(Cache.Satisfaction.Details.end(),
Satisfaction.Details.begin() + Size,
Satisfaction.Details.end());
Cache.SubstExpr = E;
S.UnsubstitutedConstraintSatisfactionCache.insert({ID, std::move(Cache)});
return E;
Expand Down Expand Up @@ -1012,8 +1014,9 @@ ExprResult ConstraintSatisfactionChecker::Evaluate(
UnsubstitutedConstraintSatisfactionCacheResult Cache;
Cache.Satisfaction.ContainsErrors = Satisfaction.ContainsErrors;
Cache.Satisfaction.IsSatisfied = Satisfaction.IsSatisfied;
std::copy(Satisfaction.Details.begin() + Size, Satisfaction.Details.end(),
std::back_inserter(Cache.Satisfaction.Details));
Cache.Satisfaction.Details.insert(Cache.Satisfaction.Details.end(),
Satisfaction.Details.begin() + Size,
Satisfaction.Details.end());
Cache.SubstExpr = CE;
S.UnsubstitutedConstraintSatisfactionCache.insert({ID, std::move(Cache)});
return CE;
Expand Down Expand Up @@ -1217,10 +1220,10 @@ bool Sema::CheckConstraintSatisfaction(
return false;
}

static const ExprResult
SubstituteConceptsInConstrainExpression(Sema &S, const NamedDecl *D,
const ConceptSpecializationExpr *CSE,
UnsignedOrNone SubstIndex) {
static ExprResult
SubstituteConceptsInConstraintExpression(Sema &S, const NamedDecl *D,
const ConceptSpecializationExpr *CSE,
UnsignedOrNone SubstIndex) {

// [C++2c] [temp.constr.normal]
// Otherwise, to form CE, any non-dependent concept template argument Ai
Expand Down Expand Up @@ -1255,7 +1258,7 @@ bool Sema::CheckConstraintSatisfaction(
const ConceptSpecializationExpr *ConstraintExpr,
ConstraintSatisfaction &Satisfaction) {

ExprResult Res = SubstituteConceptsInConstrainExpression(
ExprResult Res = SubstituteConceptsInConstraintExpression(
*this, nullptr, ConstraintExpr, ArgPackSubstIndex);
if (!Res.isUsable())
return true;
Expand Down Expand Up @@ -2289,7 +2292,7 @@ NormalizedConstraint *NormalizedConstraint::fromConstraintExpr(
ConceptDecl *CD = CSE->getNamedConcept()->getCanonicalDecl();

ExprResult Res =
SubstituteConceptsInConstrainExpression(S, D, CSE, SubstIndex);
SubstituteConceptsInConstraintExpression(S, D, CSE, SubstIndex);
if (!Res.isUsable())
return nullptr;

Expand Down
Loading