diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/variadic-parm1.C | 17 |
3 files changed, 24 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 12bbecf..6a7ba56 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2020-02-05 Jason Merrill <jason@redhat.com> + + PR c++/93140 + * pt.c (tsubst_decl) [PARM_DECL]: Check cp_unevaluated_operand in + handling of TREE_CHAIN for empty pack. + 2020-02-05 Jakub Jelinek <jakub@redhat.com> PR c++/93557 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 40ff3c3..01bade8 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -14076,7 +14076,7 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) /* Zero-length parameter packs are boring. Just substitute into the chain. */ - if (len == 0) + if (len == 0 && !cp_unevaluated_operand) RETURN (tsubst (TREE_CHAIN (t), args, complain, TREE_CHAIN (t))); } diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-parm1.C b/gcc/testsuite/g++.dg/cpp0x/variadic-parm1.C new file mode 100644 index 0000000..4300c78 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic-parm1.C @@ -0,0 +1,17 @@ +// PR c++/93140 +// { dg-do compile { target c++11 } } + +int +bar () +{ + return 42; +} + +template <typename... R> +void foo (R... r, decltype (bar (r...)) x = 0) {} + +int +main () +{ + foo (3); +} |