Patchwork C++ PATCH for c++/50830 (another variadic template template parameter issue)

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

Comments

Jason Merrill - April 17, 2012, 2:25 a.m.
Here, we were getting confused and thinking that an argument pack of 
template template arguments wasn't suitable for a template template 
parameter pack.  But it is.

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

Patch

commit 6143aa83bb48ef7c9d2bbcb0dff13a964036b3d1
Author: Jason Merrill <jason@redhat.com>
Date:   Mon Apr 16 11:53:57 2012 -0400

    	PR c++/50830
    	* pt.c (convert_template_argument): Handle template template
    	argument packs.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 7423781..fcefc94 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6428,6 +6428,7 @@  convert_template_argument (tree parm,
   is_tmpl_type = 
     ((TREE_CODE (arg) == TEMPLATE_DECL
       && TREE_CODE (DECL_TEMPLATE_RESULT (arg)) == TYPE_DECL)
+     || (requires_tmpl_type && TREE_CODE (arg) == TYPE_ARGUMENT_PACK)
      || TREE_CODE (arg) == TEMPLATE_TEMPLATE_PARM
      || TREE_CODE (arg) == UNBOUND_CLASS_TEMPLATE);
 
@@ -6499,7 +6500,9 @@  convert_template_argument (tree parm,
     {
       if (requires_tmpl_type)
 	{
-	  if (TREE_CODE (TREE_TYPE (arg)) == UNBOUND_CLASS_TEMPLATE)
+	  if (template_parameter_pack_p (parm) && ARGUMENT_PACK_P (orig_arg))
+	    val = orig_arg;
+	  else if (TREE_CODE (TREE_TYPE (arg)) == UNBOUND_CLASS_TEMPLATE)
 	    /* The number of argument required is not known yet.
 	       Just accept it for now.  */
 	    val = TREE_TYPE (arg);
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic129.C b/gcc/testsuite/g++.dg/cpp0x/variadic129.C
new file mode 100644
index 0000000..7118301
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic129.C
@@ -0,0 +1,19 @@ 
+// PR c++/50830
+// { dg-do compile { target c++11 } }
+
+template<template<class> class...>
+struct list_templates {};
+
+template<class>
+struct aa {};
+
+template<class... T>
+struct test {};
+
+template<template<class> class... F, class T>
+struct test<list_templates<F...>, T>
+{
+    struct inner {};
+};
+
+test<list_templates<aa>, int> a4; // error