[pushed] c++: unexpanded pack in enum in lambda [PR100109]

[Jason Merrill via Gcc-patches]

Another construct we need to look inside.

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

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.
---
 gcc/cp/pt.c                                           | 8 +++++++-
 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic14.C | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic14.C

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 19fdafa4c43..7bcbe6dc3ce 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 00000000000..185aa0332e7
--- /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<>();

base-commit: f1a68574b1f8d2961d3a676dbcf0cc24b6368578
-- 
2.27.0