diff options
| author | Jason Merrill <jason@redhat.com> | 2015-07-06 18:13:37 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-07-06 18:13:37 -0400 |
| commit | d762287d87b36ae3ac0a6fc57969bd2f1d1c3a9c (patch) | |
| tree | 4d9b6ced3760d793d60e94d45e57671f83172d1c | |
| parent | 5ef7cdf81cb9b4aadae649a7e3774075d81f0862 (diff) | |
| download | gcc-d762287d87b36ae3ac0a6fc57969bd2f1d1c3a9c.zip gcc-d762287d87b36ae3ac0a6fc57969bd2f1d1c3a9c.tar.gz gcc-d762287d87b36ae3ac0a6fc57969bd2f1d1c3a9c.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c72954d..cb59877 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 e819b69..0302de1 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)) |