aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2020-02-25 13:37:18 -0500
committerJason Merrill <jason@redhat.com>2020-02-25 14:42:56 -0500
commit7ac251ee4fa84f5a7583c597fa0641278e3855fc (patch)
treebc516ccc9d26f5c33c46542db1a18a4a72fa2199 /gcc/cp
parentd9814ee5972b48eb67a7af171957d1a285453f46 (diff)
downloadgcc-7ac251ee4fa84f5a7583c597fa0641278e3855fc.zip
gcc-7ac251ee4fa84f5a7583c597fa0641278e3855fc.tar.gz
gcc-7ac251ee4fa84f5a7583c597fa0641278e3855fc.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. gcc/cp/ChangeLog 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.
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/pt.c2
2 files changed, 6 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);