diff options
| author | Jason Merrill <jason@redhat.com> | 2019-04-03 00:48:45 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2019-04-03 00:48:45 -0400 |
| commit | a3379186762d6348e45bc5df34dfdea3e26bff98 (patch) | |
| tree | 7491ac8809271c58f0a866929576efec5237aa29 /gcc | |
| parent | 38802907f28249f501110e41d9ece9c5b7d9167b (diff) | |
| download | gcc-a3379186762d6348e45bc5df34dfdea3e26bff98.zip gcc-a3379186762d6348e45bc5df34dfdea3e26bff98.tar.gz gcc-a3379186762d6348e45bc5df34dfdea3e26bff98.tar.bz2 | |
PR c++/89917 - ICE with lambda in variadic mem-init.
A mem-initializer is not a type, and we don't want to turn autos within it
into packs.
* pt.c (make_pack_expansion): Change type_pack_expansion_p to false.
From-SVN: r270111
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic8.C | 14 |
3 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 38f3e92a..bb71913 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2019-04-03 Jason Merrill <jason@redhat.com> + + PR c++/89917 - ICE with lambda in variadic mem-init. + * pt.c (make_pack_expansion): Change type_pack_expansion_p to false. + 2019-04-01 Jason Merrill <jason@redhat.com> PR c++/86946 - ICE with function call in template argument. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c72004a..2b92b60 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3933,7 +3933,7 @@ make_pack_expansion (tree arg, tsubst_flags_t complain) class expansion. */ ppd.visited = new hash_set<tree>; ppd.parameter_packs = ¶meter_packs; - ppd.type_pack_expansion_p = true; + ppd.type_pack_expansion_p = false; gcc_assert (TYPE_P (TREE_PURPOSE (arg))); cp_walk_tree (&TREE_PURPOSE (arg), &find_parameter_packs_r, &ppd, ppd.visited); diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic8.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic8.C new file mode 100644 index 0000000..50473f7 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic8.C @@ -0,0 +1,14 @@ +// PR c++/89917 +// { dg-do compile { target c++11 } } + +struct A +{ + A(...); +}; + +template<typename... T> struct B : T... +{ + B() : T([]{})... {} +}; + +B<A> b; |