From 2602f8fe61dcf2388890bbbdb938e46ce9d2936b Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 20 Jun 2011 10:40:10 -0400 Subject: [PATCH] re PR c++/49205 ([C++0x] Default constructor with pack expansion parameter not detected) PR c++/49205 * call.c (sufficient_parms_p): Allow parameter packs too. From-SVN: r175214 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/call.c | 7 ++++--- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/cpp0x/variadic-default.C | 12 ++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic-default.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1746670..87e5164 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-06-20 Jason Merrill + PR c++/49205 + * call.c (sufficient_parms_p): Allow parameter packs too. + PR c++/43321 * semantics.c (describable_type): Remove. * cp-tree.h: Likewise. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 05bf983..09d73d0 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -534,15 +534,16 @@ null_ptr_cst_p (tree t) return false; } -/* Returns nonzero if PARMLIST consists of only default parms and/or - ellipsis. */ +/* Returns nonzero if PARMLIST consists of only default parms, + ellipsis, and/or undeduced parameter packs. */ bool sufficient_parms_p (const_tree parmlist) { for (; parmlist && parmlist != void_list_node; parmlist = TREE_CHAIN (parmlist)) - if (!TREE_PURPOSE (parmlist)) + if (!TREE_PURPOSE (parmlist) + && !PACK_EXPANSION_P (TREE_VALUE (parmlist))) return false; return true; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6bfc81b..abc6245 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2011-06-20 Jason Merrill + PR c++/49205 + * g++.dg/cpp0x/variadic-default.C: New. + PR c++/43321 * g++.dg/cpp0x/auto26.C: New. diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-default.C b/gcc/testsuite/g++.dg/cpp0x/variadic-default.C new file mode 100644 index 0000000..2625e25 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic-default.C @@ -0,0 +1,12 @@ +// PR c++/49205 +// { dg-options -std=c++0x } + +#include + +struct A { + template A(T...); + A(std::initializer_list); + A(std::initializer_list); +}; + +A a{}; -- 2.7.4