aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2021-04-20 00:50:49 -0400
committerJason Merrill <jason@redhat.com>2021-04-20 08:35:14 -0400
commit7f5deba1c21888aacedae93e9f324827073a1d1e (patch)
tree0e68da4a5e5eb75fe725539fb5e50cc60806aece /gcc
parentf1a68574b1f8d2961d3a676dbcf0cc24b6368578 (diff)
downloadgcc-7f5deba1c21888aacedae93e9f324827073a1d1e.zip
gcc-7f5deba1c21888aacedae93e9f324827073a1d1e.tar.gz
gcc-7f5deba1c21888aacedae93e9f324827073a1d1e.tar.bz2
c++: unexpanded pack in enum in lambda [PR100109]
Another construct we need to look inside. gcc/cp/ChangeLog: PR c++/100109 * pt.c (find_parameter_packs_r): Look into enum initializers. gcc/testsuite/ChangeLog: PR c++/100109 * g++.dg/cpp0x/lambda/lambda-variadic14.C: New test.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/pt.c8
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic14.C8
2 files changed, 15 insertions, 1 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 19fdafa..7bcbe6d 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4066,12 +4066,18 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data)
return NULL_TREE;
case TAG_DEFN:
- /* Local class, need to look through the whole definition. */
t = TREE_TYPE (t);
if (CLASS_TYPE_P (t))
+ /* Local class, need to look through the whole definition. */
for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t)))
cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r,
ppd, ppd->visited);
+ else
+ /* Enum, look at the values. */
+ for (tree l = TYPE_VALUES (t); l; l = TREE_CHAIN (l))
+ cp_walk_tree (&DECL_INITIAL (TREE_VALUE (l)),
+ &find_parameter_packs_r,
+ ppd, ppd->visited);
return NULL_TREE;
case FUNCTION_TYPE:
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic14.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic14.C
new file mode 100644
index 0000000..185aa03
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic14.C
@@ -0,0 +1,8 @@
+// PR c++/100109
+// { dg-do compile { target c++11 } }
+
+template <int... E>
+void f() {
+ [] { enum e { e = E }; }; // { dg-error "not expanded" }
+}
+template void f<>();