From d762287d87b36ae3ac0a6fc57969bd2f1d1c3a9c Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 6 Jul 2015 18:13:37 -0400 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 3 +++ 2 files changed, 8 insertions(+) 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 + + * pt.c (argument_pack_element_is_expansion_p): A decl pack is an + expansion. + 2015-07-02 Jason Merrill 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)) -- 2.30.2