Skip to content

Commit 232def4

Browse files
committed
s/AreSubsumptionEligible/AreCompatibleForSubsumption to use the correct standard term
1 parent 5c0c101 commit 232def4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

clang/include/clang/Sema/SemaConcept.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ struct FoldExpandedConstraint {
183183
bool subsumes(const FoldExpandedConstraint &Other,
184184
const AtomicSubsumptionEvaluator &E) const;
185185

186-
static bool AreSubsumptionEligible(const FoldExpandedConstraint &A,
187-
const FoldExpandedConstraint &B);
186+
static bool AreCompatibleForSubsumption(const FoldExpandedConstraint &A,
187+
const FoldExpandedConstraint &B);
188188
};
189189

190190
const NormalizedConstraint *getNormalizedAssociatedConstraints(
@@ -262,7 +262,7 @@ template <typename AtomicSubsumptionEvaluator>
262262
bool FoldExpandedConstraint::subsumes(
263263
const FoldExpandedConstraint &Other,
264264
const AtomicSubsumptionEvaluator &E) const {
265-
if (Kind != Other.Kind || !AreSubsumptionEligible(*this, Other))
265+
if (Kind != Other.Kind || !AreCompatibleForSubsumption(*this, Other))
266266
return false;
267267

268268
const NormalForm PDNF = makeDNF(this->Constraint);

clang/lib/Sema/SemaConcept.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1607,7 +1607,7 @@ NormalizedConstraint::fromConstraintExpr(Sema &S, NamedDecl *D, const Expr *E) {
16071607
return NormalizedConstraint{new (S.Context) AtomicConstraint(S, E)};
16081608
}
16091609

1610-
bool FoldExpandedConstraint::AreSubsumptionEligible(
1610+
bool FoldExpandedConstraint::AreCompatibleForSubsumption(
16111611
const FoldExpandedConstraint &A, const FoldExpandedConstraint &B) {
16121612
llvm::SmallVector<UnexpandedParameterPack> APacks, BPacks;
16131613
Sema::collectUnexpandedParameterPacks(const_cast<Expr *>(A.Pattern), APacks);

0 commit comments

Comments
 (0)