From: Jason Merrill Date: Thu, 26 May 2011 13:22:51 +0000 (-0400) Subject: re PR c++/48424 (C++0x parameter packs expansion problem) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b613992600ec23a017a1c1d2c82adf0fe06cdd92;p=gcc.git re PR c++/48424 (C++0x parameter packs expansion problem) PR c++/48424 * decl.c (grokparms): Function parameter packs don't need to go at the end. * pt.c (type_unification_real): But they aren't deduced otherwise. From-SVN: r174285 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 582935c5c5b..de154ae3847 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2011-05-26 Jason Merrill + + PR c++/48424 + * decl.c (grokparms): Function parameter packs don't need to + go at the end. + * pt.c (type_unification_real): But they aren't deduced otherwise. + 2011-05-25 Jason Merrill PR c++/48536 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 8ab0c8afc7f..a956dbb266b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -10551,12 +10551,6 @@ grokparms (tree parmlist, tree *parms) init = check_default_argument (decl, init); } - if (TREE_CODE (decl) == PARM_DECL - && FUNCTION_PARAMETER_PACK_P (decl) - && TREE_CHAIN (parm) - && TREE_CHAIN (parm) != void_list_node) - error ("parameter packs must be at the end of the parameter list"); - DECL_CHAIN (decl) = decls; decls = decl; result = tree_cons (init, type, result); diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c9c25cd2c55..ab48c8f7f92 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -14262,11 +14262,24 @@ type_unification_real (tree tparms, while (parms && parms != void_list_node && ia < nargs) { - if (TREE_CODE (TREE_VALUE (parms)) == TYPE_PACK_EXPANSION) - break; - parm = TREE_VALUE (parms); + + if (TREE_CODE (parm) == TYPE_PACK_EXPANSION + && (!TREE_CHAIN (parms) || TREE_CHAIN (parms) == void_list_node)) + /* For a function parameter pack that occurs at the end of the + parameter-declaration-list, the type A of each remaining + argument of the call is compared with the type P of the + declarator-id of the function parameter pack. */ + break; + parms = TREE_CHAIN (parms); + + if (TREE_CODE (parm) == TYPE_PACK_EXPANSION) + /* For a function parameter pack that does not occur at the + end of the parameter-declaration-list, the type of the + parameter pack is a non-deduced context. */ + continue; + arg = args[ia]; ++ia; arg_expr = NULL; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 089406dec33..7e71ee230f6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-05-26 Jason Merrill + + * g++.dg/cpp0x/variadic111.C: New. + * g++.dg/cpp0x/variadic41.C: Adjust. + 2011-05-26 Richard Guenther PR tree-optimization/48702 diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic111.C b/gcc/testsuite/g++.dg/cpp0x/variadic111.C new file mode 100644 index 00000000000..378162e162d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic111.C @@ -0,0 +1,19 @@ +// PR c++/48424 +// { dg-options -std=c++0x } + +template +struct S +{ + template + void f(Args1... args1, Args2&&... args2) + { + } +}; + +int main() +{ + S s; + s.f(1,2.0,false,'a'); +} + +// { dg-final { scan-assembler "_ZN1SIIidEE1fIIbcEEEvidDpOT_" } } diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic41.C b/gcc/testsuite/g++.dg/cpp0x/variadic41.C index d209766d132..9cfd847f318 100644 --- a/gcc/testsuite/g++.dg/cpp0x/variadic41.C +++ b/gcc/testsuite/g++.dg/cpp0x/variadic41.C @@ -1,3 +1,14 @@ +// A function parameter pack is only deduced if it's at the end // { dg-options "-std=gnu++0x" } template -void f(const Args&... args, int oops); // { dg-error "end" } +void f(const Args&... args, int oops); + +int main() +{ + f<>(1); + f(1); + f(1,2); + f(1,2); // { dg-error "no match" } +} + +// { dg-prune-output "note" }