From: Jason Merrill <jason@redhat.com>
Date: Mon, 6 Jul 2015 22:13:37 +0000 (-0400)
Subject: pt.c (argument_pack_element_is_expansion_p): A decl pack is an expansion.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d762287d87b36ae3ac0a6fc57969bd2f1d1c3a9c;p=gcc.git

pt.c (argument_pack_element_is_expansion_p): A decl pack is an expansion.

	* pt.c (argument_pack_element_is_expansion_p): A decl pack is an
	expansion.

From-SVN: r225494
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c72954dd82e..cb598776a50 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-06  Jason Merrill  <jason@redhat.com>
+
+	* pt.c (argument_pack_element_is_expansion_p): A decl pack is an
+	expansion.
+
 2015-07-02  Jason Merrill  <jason@redhat.com>
 
 	PR c++/66743
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index e819b69ede3..0302de1270d 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9838,6 +9838,9 @@ argument_pack_element_is_expansion_p (tree arg_pack, int i)
   if (i >= TREE_VEC_LENGTH (vec))
     return 0;
   tree elt = TREE_VEC_ELT (vec, i);
+  if (DECL_P (elt))
+    /* A decl pack is itself an expansion.  */
+    elt = TREE_TYPE (elt);
   if (!PACK_EXPANSION_P (elt))
     return 0;
   if (PACK_EXPANSION_EXTRA_ARGS (elt))