OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR c++/71837 - pack expansion in init-capture 

* lambda.c (add_capture): Leave a pack expansion in a TREE_LIST.
	(build_lambda_object): Call build_x_compound_expr_from_list.
	* pt.c (tsubst) [DECLTYPE_TYPE]: Likewise.

From-SVN: r238733
This commit is contained in:
Jason Merrill 2016-07-25 15:16:16 -04:00 committed by Jason Merrill
parent e27f0bc9ca
commit 47265942fa
5 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,5 +1,10 @@
2016-07-25 Jason Merrill <jason@redhat.com>
PR c++/71837
* lambda.c (add_capture): Leave a pack expansion in a TREE_LIST.
(build_lambda_object): Call build_x_compound_expr_from_list.
* pt.c (tsubst) [DECLTYPE_TYPE]: Likewise.
PR c++/71833
PR c++/54440
* pt.c (coerce_template_parameter_pack): Fix logic for

8
gcc/cp/lambda.c
View File

@ -79,6 +79,10 @@ build_lambda_object (tree lambda_expr)
goto out;
}
if (TREE_CODE (val) == TREE_LIST)
val = build_x_compound_expr_from_list (val, ELK_INIT,
tf_warning_or_error);
if (DECL_P (val))
mark_used (val);
@ -449,7 +453,9 @@ add_capture (tree lambda, tree id, tree orig_init, bool by_reference_p,
variadic = true;
}
if (TREE_CODE (initializer) == TREE_LIST)
if (TREE_CODE (initializer) == TREE_LIST
/* A pack expansion might end up with multiple elements. */
&& !PACK_EXPANSION_P (TREE_VALUE (initializer)))
initializer = build_x_compound_expr_from_list (initializer, ELK_INIT,
tf_warning_or_error);
type = TREE_TYPE (initializer);

12
gcc/cp/pt.c
View File

@ -13620,6 +13620,18 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
/*function_p*/false,
/*integral_constant_expression*/false);
if (DECLTYPE_FOR_INIT_CAPTURE (t))
{
if (type == NULL_TREE)
{
if (complain & tf_error)
error ("empty initializer in lambda init-capture");
type = error_mark_node;
}
else if (TREE_CODE (type) == TREE_LIST)
type = build_x_compound_expr_from_list (type, ELK_INIT, complain);
}
--cp_unevaluated_operand;
--c_inhibit_evaluation_warnings;

13
gcc/testsuite/g++.dg/cpp1y/lambda-init15.C Normal file
View File

@ -0,0 +1,13 @@
// PR c++/71837
// { dg-do compile { target c++14 } }
template < typename ... Ts > void f (Ts ... args)
{
[ts (args ...)] { return ts; } ();
}
int main ()
{
f (0);
return 0;
}

14
gcc/testsuite/g++.dg/cpp1y/lambda-init15a.C Normal file
View File

@ -0,0 +1,14 @@
// PR c++/71837
// { dg-do compile { target c++14 } }
template < typename ... Ts > void f (Ts ... args)
{
[ts (args ...)] { return ts; } (); // { dg-error "" }
}
int main ()
{
f (); // { dg-message "required" }
f (1,2); // { dg-message "required" }
return 0;
}