From 434e6c8a7c07fef86ddb2347b06017fd469aebf7 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 29 Jan 2014 15:54:21 -0500
Subject: [PATCH] re PR c++/58466 (ICE in cxx_eval_constant_expression)

	PR c++/58466
	* pt.c (unify_pack_expansion): Call expand_template_argument_pack.

From-SVN: r207283
---
 gcc/cp/ChangeLog                         |  3 +++
 gcc/cp/pt.c                              |  3 +++
 gcc/testsuite/g++.dg/cpp0x/variadic147.C | 10 ++++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic147.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 723ce954e06..e24a9aea8c7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2014-01-29  Jason Merrill  <jason@redhat.com>
 
+	PR c++/58466
+	* pt.c (unify_pack_expansion): Call expand_template_argument_pack.
+
 	PR c++/59956
 	* friend.c (do_friend): Pass the TEMPLATE_DECL to add_friend if we
 	have a friend template in a class template.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 943255d0da7..9be91711e55 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -16897,6 +16897,9 @@ unify_pack_expansion (tree tparms, tree targs, tree packed_parms,
   tree pattern = PACK_EXPANSION_PATTERN (parm);
   tree pack, packs = NULL_TREE;
   int i, start = TREE_VEC_LENGTH (packed_parms) - 1;
+
+  packed_args = expand_template_argument_pack (packed_args);
+
   int len = TREE_VEC_LENGTH (packed_args);
 
   /* Determine the parameter packs we will be deducing from the
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic147.C b/gcc/testsuite/g++.dg/cpp0x/variadic147.C
new file mode 100644
index 00000000000..7f606d84a1e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic147.C
@@ -0,0 +1,10 @@
+// PR c++/58466
+// { dg-require-effective-target c++11 }
+
+template<char, char...> struct A;
+
+template<typename> struct B;
+
+template<char... C> struct B<A<C...>> {};
+
+B<A<'X'>> b;