diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/variadic162.C | 14 |
3 files changed, 26 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e0cd3192262..8a29a7627ce 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-10-08 Jason Merrill <jason@redhat.com> + + PR c++/63405 + * pt.c (tsubst_pack_expansion): Limit simple expansion to type packs. + 2014-09-25 Jakub Jelinek <jakub@redhat.com> PR c++/63249 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 6e292a27bf4..97fa4dd1bc9 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -9821,7 +9821,13 @@ tsubst_pack_expansion (tree t, tree args, tsubst_flags_t complain, /* If the expansion is just T..., return the matching argument pack. */ if (!unsubstituted_packs && TREE_PURPOSE (packs) == pattern) - return ARGUMENT_PACK_ARGS (TREE_VALUE (packs)); + { + tree args = ARGUMENT_PACK_ARGS (TREE_VALUE (packs)); + if (TREE_CODE (t) == TYPE_PACK_EXPANSION + || pack_expansion_args_count (args)) + return args; + /* Otherwise use the normal path so we get convert_from_reference. */ + } /* We cannot expand this expansion expression, because we don't have all of the argument packs we need. */ diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic162.C b/gcc/testsuite/g++.dg/cpp0x/variadic162.C new file mode 100644 index 00000000000..9e5386deb47 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic162.C @@ -0,0 +1,14 @@ +// PR c++/63405 +// { dg-do compile { target c++11 } } + +template <typename _Tp> _Tp forward(_Tp); +template <typename Args> struct Format { Format(int, Args); }; +template <typename... Args> auto format(Args &&... args) -> Format<Args...> { + return {0, args...}; +} + +template <typename... Args> void msg(Args... args) { + format(forward(args)...); +} + +void some_function() { msg('x'); } |
