aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/pt.c2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic8.C14
3 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ffb25f3..a1fee50 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-25 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.
+
2020-02-24 Jason Merrill <jason@redhat.com>
PR c++/90951
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 6dc455a..2dc5af4 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3944,7 +3944,7 @@ make_pack_expansion (tree arg, tsubst_flags_t complain)
class expansion. */
ppd.visited = new hash_set<tree>;
ppd.parameter_packs = &parameter_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;