Skip to content

[clang] NFCI: don't check deduced constraints when partial ordering #106882

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
Sep 1, 2024
Merged

[clang] NFCI: don't check deduced constraints when partial ordering #106882

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
36 changes: 15 additions & 21 deletions clang/lib/Sema/SemaTemplateDeduction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3313,10 +3313,12 @@ FinishTemplateArgumentDeduction(
if (Trap.hasErrorOccurred())
return TemplateDeductionResult::SubstitutionFailure;

if (auto Result = CheckDeducedArgumentConstraints(S, Partial, SugaredBuilder,
CanonicalBuilder, Info);
Result != TemplateDeductionResult::Success)
return Result;
if (!IsPartialOrdering) {
if (auto Result = CheckDeducedArgumentConstraints(
S, Partial, SugaredBuilder, CanonicalBuilder, Info);
Result != TemplateDeductionResult::Success)
return Result;
}

return TemplateDeductionResult::Success;
}
Expand Down Expand Up @@ -3364,13 +3366,16 @@ static TemplateDeductionResult FinishTemplateArgumentDeduction(
if (Trap.hasErrorOccurred())
return TemplateDeductionResult::SubstitutionFailure;

if (auto Result = CheckDeducedArgumentConstraints(S, Template, SugaredBuilder,
CanonicalBuilder, Info);
Result != TemplateDeductionResult::Success)
return Result;
if (!PartialOrdering) {
if (auto Result = CheckDeducedArgumentConstraints(
S, Template, SugaredBuilder, CanonicalBuilder, Info);
Result != TemplateDeductionResult::Success)
return Result;
}

return TemplateDeductionResult::Success;
}

/// Complete template argument deduction for DeduceTemplateArgumentsFromType.
/// FIXME: this is mostly duplicated with the above two versions. Deduplicate
/// the three implementations.
Expand Down Expand Up @@ -5595,19 +5600,8 @@ static TemplateDeductionResult FinishTemplateArgumentDeduction(
TDR != TemplateDeductionResult::Success)
return TDR;

// C++20 [temp.deduct]p5 - Only check constraints when all parameters have
// been deduced.
if (!IsIncomplete) {
if (auto Result = CheckDeducedArgumentConstraints(S, FTD, SugaredBuilder,
CanonicalBuilder, Info);
Result != TemplateDeductionResult::Success)
return Result;
}

if (Trap.hasErrorOccurred())
return TemplateDeductionResult::SubstitutionFailure;

return TemplateDeductionResult::Success;
return Trap.hasErrorOccurred() ? TemplateDeductionResult::SubstitutionFailure
: TemplateDeductionResult::Success;
}

/// Determine whether the function template \p FT1 is at least as
Expand Down