diff mbox series

[C++] PR c++/89917 - ICE with lambda in variadic mem-init.

Message ID 20190403044759.5207-1-jason@redhat.com
State New
Headers show
Series [C++] PR c++/89917 - ICE with lambda in variadic mem-init. | expand

Commit Message

Jason Merrill April 3, 2019, 4:47 a.m. UTC 
A mem-initializer is not a type, and we don't want to turn autos within it
into packs.

Tested x86_64-pc-linux-gnu, applying to trunk.

	* pt.c (make_pack_expansion): Change type_pack_expansion_p to false.
---
 gcc/cp/pt.c                                        |  2 +-
 .../g++.dg/cpp0x/lambda/lambda-variadic8.C         | 14 ++++++++++++++
 gcc/cp/ChangeLog                                   |  5 +++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic8.C


base-commit: 9535273c79161a2601fe7c80be8ddcffcf740dc4
diff mbox series

Patch

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index c72004a74e3..2b92b608f5d 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 = &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 00000000000..50473f70214
--- /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;
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 38f3e92a0ef..bb719133a97 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.