From 3133bfbb2caec40876d9241f428741c0988c9ac3 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 17 Apr 2012 14:10:54 +0000
Subject: [PATCH] 	PR c++/50303 	* pt.c (tsubst_pack_expansion): Use
 tsubst_expr for template 	template parameters.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@186531 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                         |  6 ++++++
 gcc/cp/pt.c                              |  2 +-
 gcc/testsuite/ChangeLog                  |  5 +++++
 gcc/testsuite/g++.dg/cpp0x/variadic128.C | 16 ++++++++++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic128.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a548604af5e..d5bbaee1296 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-16  Jason Merrill  <jason@redhat.com>
+
+	PR c++/50303
+	* pt.c (tsubst_pack_expansion): Use tsubst_expr for template
+	template parameters.
+
 2012-04-15  Jason Merrill  <jason@redhat.com>
 
 	PR c++/52292
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 3c8fea234d6..ea20323424c 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9563,7 +9563,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/ChangeLog b/gcc/testsuite/ChangeLog
index e4fe97cb96b..0c72e98ca79 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-16  Jason Merrill  <jason@redhat.com>
+
+	PR c++/50303
+	* g++.dg/cpp0x/variadic128.C: New.
+
 2012-04-16  Uros Bizjak  <ubizjak@gmail.com>
 
 	Backport from mainline
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic128.C b/gcc/testsuite/g++.dg/cpp0x/variadic128.C
new file mode 100644
index 00000000000..8c2d3b23359
--- /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>();
+}
-- 
2.11.0