diff options
| author | Jason Merrill <jason@redhat.com> | 2009-10-07 14:56:39 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-10-07 14:56:39 -0400 |
| commit | f484a91ab45ed2eeeb4d87b454e14578cc506428 (patch) | |
| tree | d971829884ca962d3fef6f03af6da887f9626713 | |
| parent | 7097b3ac3985a96b6e76a634214acd3726b53744 (diff) | |
| download | gcc-f484a91ab45ed2eeeb4d87b454e14578cc506428.zip gcc-f484a91ab45ed2eeeb4d87b454e14578cc506428.tar.gz gcc-f484a91ab45ed2eeeb4d87b454e14578cc506428.tar.bz2 | |
re PR c++/39863 ([c++0x] variadic templates : wrong error "mismatched argument pack lengths")
PR c++/39863
* pt.c (tsubst_pack_expansion): Don't do anything now if we
have incomplete packs of different lengths.
From-SVN: r152537
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/variadic95.C | 17 |
4 files changed, 29 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bb4ec8d..cc6fa63 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2009-10-07 Jason Merrill <jason@redhat.com> + PR c++/39863 + * pt.c (tsubst_pack_expansion): Don't do anything now if we + have incomplete packs of different lengths. + PR c++/41038 * tree.c (build_qualified_name): Call convert_from_reference. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 6b98956..9ef3f79 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7944,6 +7944,10 @@ tsubst_pack_expansion (tree t, tree args, tsubst_flags_t complain, } else if (len != my_len) { + if (incomplete) + /* We got explicit args for some packs but not others; + do nothing now and try again after deduction. */ + return t; if (TREE_CODE (t) == TYPE_PACK_EXPANSION) error ("mismatched argument pack lengths while expanding " "%<%T%>", diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a7b7a16..fe14298 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2009-10-07 Jason Merrill <jason@redhat.com> + * g++.dg/cpp0x/variadic95.C: New. + +2009-10-07 Jason Merrill <jason@redhat.com> + * g++.dg/template/scope3.C: New. 2009-10-07 Jakub Jelinek <jakub@redhat.com> diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic95.C b/gcc/testsuite/g++.dg/cpp0x/variadic95.C new file mode 100644 index 0000000..ebb04eb --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic95.C @@ -0,0 +1,17 @@ +// PR c++/39863 +// { dg-options -std=c++0x } + +template <typename... T> +struct A {}; + +template <typename T, typename U> +struct S {}; + +template <typename... T, typename... U> +A< S<T, U>... > f(U... u) +{ return A< S<T, U>... >(); } + +int main() +{ + f<int>(0.0); +} |