From 3ab97d92fc7e94b54411aa7629b13b4a4381304b Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 16 Apr 2012 22:29:35 -0400
Subject: [PATCH] re PR c++/50830 ([c++0x] Variadic template, inner class
 error)

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

From-SVN: r186520
---
 gcc/cp/ChangeLog                         |  4 ++++
 gcc/cp/pt.c                              |  5 ++++-
 gcc/testsuite/ChangeLog                  |  3 +++
 gcc/testsuite/g++.dg/cpp0x/variadic129.C | 19 +++++++++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic129.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3f2b9991161..24ce8e0cd6b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2012-04-16  Jason Merrill  <jason@redhat.com>
 
+	PR c++/50830
+	* pt.c (convert_template_argument): Handle template template
+	argument packs.
+
 	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 742378179a2..fcefc943376 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/ChangeLog b/gcc/testsuite/ChangeLog
index 42e33c7452c..1ced5be65fb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-16  Jason Merrill  <jason@redhat.com>
 
+	PR c++/50830
+	* g++.dg/cpp0x/variadic129.C: New.
+
 	PR c++/50303
 	* g++.dg/cpp0x/variadic128.C: New.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic129.C b/gcc/testsuite/g++.dg/cpp0x/variadic129.C
new file mode 100644
index 00000000000..7118301418a
--- /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
-- 
2.30.2