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

re PR c++/60252 ([c++11] ICE with invalid variable-length array in lambda parameter)

Browse Source 
PR c++/60252
	* lambda.c (maybe_resolve_dummy): Check lambda_function rather
	than current_binding_level.

From-SVN: r208028
This commit is contained in:
Jason Merrill 2014-02-21 16:50:52 -05:00 committed by Jason Merrill
parent b98fb3633e
commit e7b67047c7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
2014-02-21 Jason Merrill <jason@redhat.com>
PR c++/60252
* lambda.c (maybe_resolve_dummy): Check lambda_function rather
than current_binding_level.
PR c++/60186
* typeck2.c (massage_init_elt): Call fold_non_dependent_expr_sfinae.

6
gcc/cp/lambda.c
View File

@ -749,10 +749,8 @@ maybe_resolve_dummy (tree object)
if (type != current_class_type
&& current_class_type
&& LAMBDA_TYPE_P (current_class_type)
&& DERIVED_FROM_P (type, current_nonlambda_class_type ())
/* If we get here while parsing the parameter list of a lambda, it
will fail, so don't even try (c++/60252). */
&& current_binding_level->kind != sk_function_parms)
&& lambda_function (current_class_type)
&& DERIVED_FROM_P (type, current_nonlambda_class_type ()))
{
/* In a lambda, need to go through 'this' capture. */
tree lam = CLASSTYPE_LAMBDA_EXPR (current_class_type);