diff options
| author | Jason Merrill <jason@redhat.com> | 2014-01-29 17:12:09 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-01-29 17:12:09 -0500 |
| commit | 0429e064651d53720971f398de7124d9b46a09cc (patch) | |
| tree | 4f60fad5598448e9b5efb5d16e7e8711af543794 /gcc | |
| parent | 434e6c8a7c07fef86ddb2347b06017fd469aebf7 (diff) | |
| download | gcc-0429e064651d53720971f398de7124d9b46a09cc.zip gcc-0429e064651d53720971f398de7124d9b46a09cc.tar.gz gcc-0429e064651d53720971f398de7124d9b46a09cc.tar.bz2 | |
re PR c++/59989 (ICE when a template parameter pack is explicitly specified for a function template and provides a complete argument list for a template)
PR c++/59989
* pt.c (expand_template_argument_pack): Correct
non_default_args_count calculation.
From-SVN: r207285
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/variadic148.C | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e24a9ae..858272f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2014-01-29 Jason Merrill <jason@redhat.com> + PR c++/59989 + * pt.c (expand_template_argument_pack): Correct + non_default_args_count calculation. + PR c++/58466 * pt.c (unify_pack_expansion): Call expand_template_argument_pack. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 9be9171..c9c6b37 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3471,7 +3471,7 @@ expand_template_argument_pack (tree args) for (i = 0; i < num_packed; ++i, ++out_arg) TREE_VEC_ELT (result_args, out_arg) = TREE_VEC_ELT(packed, i); if (non_default_args_count > 0) - non_default_args_count += num_packed; + non_default_args_count += num_packed - 1; } else { diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic148.C b/gcc/testsuite/g++.dg/cpp0x/variadic148.C new file mode 100644 index 0000000..a4ee635 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic148.C @@ -0,0 +1,6 @@ +// PR c++/59989 +// { dg-require-effective-target c++11 } + +template<typename T> struct X {}; +template<template<typename...> class D, typename ...U> int test(D<U...>*); +int n = test<X, int>(0); // { dg-error "no match" } |