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.
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);