Skip to content

Commit b57b862

Browse files
committed
Adjust test case and format
1 parent 4477153 commit b57b862

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

clang/lib/Sema/SemaTemplateDeduction.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,7 @@ class PackDeductionScope {
995995
NewPack = Pack.DeferredDeduction;
996996
Result = checkDeducedTemplateArguments(S.Context, OldPack, NewPack);
997997
}
998+
998999
NamedDecl *Param = TemplateParams->getParam(Pack.Index);
9991000
if (Result.isNull()) {
10001001
Info.Param = makeTemplateParameter(Param);
@@ -1028,11 +1029,9 @@ class PackDeductionScope {
10281029
bool IsPartiallyExpanded = false;
10291030
bool DeducePackIfNotAlreadyDeduced = false;
10301031
bool DeducedFromEarlierParameter = false;
1031-
10321032
/// The number of expansions, if we have a fully-expanded pack in this scope.
10331033
std::optional<unsigned> FixedNumExpansions;
10341034

1035-
10361035
SmallVector<DeducedPack, 2> Packs;
10371036
};
10381037

clang/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.call/p1-0x.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void test_pair_deduction(int *ip, float *fp, double *dp) {
8181
template<typename ...Types> struct tuple { };
8282

8383
template<typename ...Types>
84-
void pack_not_at_end(tuple<Types...>, Types... values, int); // expected-note {{<int *, double *> vs. <>}}
84+
void pack_not_at_end(tuple<Types...>, Types... values, int); // expected-note {{<int *, double *> vs. <int, int>}}
8585

8686
void test_pack_not_at_end(tuple<int*, double*> t2) {
8787
pack_not_at_end(t2, 0, 0, 0); // expected-error {{no match}}

0 commit comments

Comments
 (0)