diff options
| author | Jason Merrill <jason@redhat.com> | 2014-02-21 16:50:52 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-02-21 16:50:52 -0500 |
| commit | e7b67047c79d2ea6867ed15b6441960219d77f29 (patch) | |
| tree | 49ac271d04d42323757e001460f205ae82277821 /gcc | |
| parent | b98fb3633ea72bc48ce36975aa0ac2252f279a32 (diff) | |
| download | gcc-e7b67047c79d2ea6867ed15b6441960219d77f29.zip gcc-e7b67047c79d2ea6867ed15b6441960219d77f29.tar.gz gcc-e7b67047c79d2ea6867ed15b6441960219d77f29.tar.bz2 | |
re PR c++/60252 ([c++11] ICE with invalid variable-length array in lambda parameter)
PR c++/60252
* lambda.c (maybe_resolve_dummy): Check lambda_function rather
than current_binding_level.
From-SVN: r208028
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/lambda.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8e4a2a0..dd926da 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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. diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index 7fe235b..277dec6 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -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); |