Patchwork C++ PATCH for c++/50303 (failure using template template parameter pack in a pack expansion)

login
register
mail settings
Submitter Jason Merrill
Date April 17, 2012, 2:27 a.m.
Message ID <4F8CD52E.5030702@redhat.com>
Download mbox | patch
Permalink /patch/153027/
State New
Headers show

Comments

Jason Merrill - April 17, 2012, 2:27 a.m.
When substituting into a template template parameter pack pattern with a 
set of template arguments, we want to use tsubst_expr so that we get the 
substituted result; tsubst tries and fails to build up a new template 
template parameter.

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

Patch

commit d04f9e7b78c9355e7b7835dc00fca3dfa4acc666
Author: Jason Merrill <jason@redhat.com>
Date:   Mon Apr 16 11:31:59 2012 -0400

    	PR c++/50303
    	* pt.c (tsubst_pack_expansion): Use tsubst_expr for template
    	template parameters.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 95d0aba..7423781 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9518,7 +9518,7 @@  tsubst_pack_expansion (tree t, tree args, tsubst_flags_t complain,
         }
 
       /* Substitute into the PATTERN with the altered arguments.  */
-      if (TREE_CODE (t) == EXPR_PACK_EXPANSION)
+      if (!TYPE_P (pattern))
         TREE_VEC_ELT (result, i) = 
           tsubst_expr (pattern, args, complain, in_decl,
                        /*integral_constant_expression_p=*/false);
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic128.C b/gcc/testsuite/g++.dg/cpp0x/variadic128.C
new file mode 100644
index 0000000..8c2d3b2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic128.C
@@ -0,0 +1,16 @@ 
+// PR c++/50303
+// { dg-do compile { target c++11 } }
+
+template<typename Interface>
+struct A1 {
+};
+
+template<template<class I> class... Actions>
+void g2() {
+  g2<Actions...>();
+}
+
+int main()
+{
+  g2<A1>();
+}