This is an archive of the discontinued LLVM Phabricator instance.

Differential D114207

[clang] fix regression deducing pack expansion arguments introduced by D110216
ClosedPublic

Authored by mizvekov on Nov 18 2021, 4:33 PM.

Details

Reviewers
rsmith
Commits
rG85914b757015: [clang] fix regression deducing pack expansion arguments introduced by D110216
Summary

This test case had been missing when the original code
was introduced by 2fcb863b2b278.

Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>

Diff Detail

Event Timeline

mizvekov requested review of this revision.Nov 18 2021, 4:33 PM
mizvekov created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptNov 18 2021, 4:33 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
mizvekov mentioned this in D110216: [clang] retain type sugar in auto / template argument deduction.Nov 18 2021, 5:40 PM
Harbormaster completed remote builds in B135012: Diff 388351.Nov 18 2021, 5:50 PM
lkail added a subscriber: lkail.Nov 18 2021, 6:08 PM

Confirmed it solves our internal regressions, thanks!

mizvekov added a reviewer: rsmith.Nov 18 2021, 6:22 PM
mizvekov added a comment.Nov 18 2021, 6:27 PM

Thanks for testing!

I am just going to push this since it's a straightforward regression fix and Richard is on vacations.

This revision was not accepted when it landed; it landed in state Needs Review.Nov 18 2021, 6:36 PM
Closed by commit rG85914b757015: [clang] fix regression deducing pack expansion arguments introduced by D110216 (authored by mizvekov). · Explain Why
This revision was automatically updated to reflect the committed changes.
mizvekov added a commit: rG85914b757015: [clang] fix regression deducing pack expansion arguments introduced by D110216.

Revision Contents

PathSize
clang/
lib/
Sema/
7 lines
test/
CXX/
temp/
temp.fct.spec/
temp.deduct/
temp.deduct.partial/
13 lines

Diff 388362

clang/lib/Sema/SemaTemplateDeduction.cpp

Show First 20 Lines • Show All 1,331 Lines • ▼ Show 20 Lines
/// \returns the result of template argument deduction so far. Note that a /// \returns the result of template argument deduction so far. Note that a
/// "success" result means that template argument deduction has not yet failed, /// "success" result means that template argument deduction has not yet failed,
/// but it may still fail, later, for other reasons. /// but it may still fail, later, for other reasons.
static Sema::TemplateDeductionResult DeduceTemplateArgumentsByTypeMatch( static Sema::TemplateDeductionResult DeduceTemplateArgumentsByTypeMatch(
Sema &S, TemplateParameterList *TemplateParams, QualType P, QualType A, Sema &S, TemplateParameterList *TemplateParams, QualType P, QualType A,
TemplateDeductionInfo &Info, TemplateDeductionInfo &Info,
SmallVectorImpl<DeducedTemplateArgument> &Deduced, unsigned TDF, SmallVectorImpl<DeducedTemplateArgument> &Deduced, unsigned TDF,
bool PartialOrdering, bool DeducedFromArrayBound) { bool PartialOrdering, bool DeducedFromArrayBound) {
// If the argument type is a pack expansion, look at its pattern.
// This isn't explicitly called out
if (const auto *AExp = dyn_cast<PackExpansionType>(A))
A = AExp->getPattern();
assert(!isa<PackExpansionType>(A.getCanonicalType()));
if (PartialOrdering) { if (PartialOrdering) {
// C++11 [temp.deduct.partial]p5: // C++11 [temp.deduct.partial]p5:
// Before the partial ordering is done, certain transformations are // Before the partial ordering is done, certain transformations are
// performed on the types used for partial ordering: // performed on the types used for partial ordering:
// - If P is a reference type, P is replaced by the type referred to. // - If P is a reference type, P is replaced by the type referred to.
const ReferenceType *PRef = P->getAs<ReferenceType>(); const ReferenceType *PRef = P->getAs<ReferenceType>();
if (PRef) if (PRef)
P = PRef->getPointeeType(); P = PRef->getPointeeType();
▲ Show 20 Lines • Show All 4,737 Lines • Show Last 20 Lines

clang/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.partial/p12.cpp

// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify %s // RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify %s
// expected-no-diagnostics
// Note: Partial ordering of function templates containing template // Note: Partial ordering of function templates containing template
// parameter packs is independent of the number of deduced arguments // parameter packs is independent of the number of deduced arguments
// for those template parameter packs. // for those template parameter packs.
template<class ...> struct Tuple { }; template<class ...> struct Tuple { };
template<class ... Types> int &g(Tuple<Types ...>); // #1 template<class ... Types> int &g(Tuple<Types ...>); // #1
template<class T1, class ... Types> float &g(Tuple<T1, Types ...>); // #2 template<class T1, class ... Types> float &g(Tuple<T1, Types ...>); // #2
template<class T1, class ... Types> double &g(Tuple<T1, Types& ...>); // #3 template<class T1, class ... Types> double &g(Tuple<T1, Types& ...>); // #3
Show All 10 Lines
template<class T1, class ... Types> double &h(int (*)(T1, Types& ...)); // #3 template<class T1, class ... Types> double &h(int (*)(T1, Types& ...)); // #3
void test_h() { void test_h() {
int &ir1 = h((int(*)())0); int &ir1 = h((int(*)())0);
float &fr1 = h((int(*)(int, float))0); float &fr1 = h((int(*)(int, float))0);
double &dr1 = h((int(*)(int, float&))0); double &dr1 = h((int(*)(int, float&))0);
double &dr2 = h((int(*)(int))0); double &dr2 = h((int(*)(int))0);
} }
namespace test_j {
template <int I> struct ref {};
template <int... L> void map(ref<L>...);
template <int head, int... tail> void map(ref<head> x, ref<tail>... xs); // expected-note {{here}}
template void map<0, 1>(ref<0>, ref<1>);
// expected-error@-1 {{explicit instantiation of undefined function template 'map'}}
} // namespace test_j