From: Jason Merrill <jason@redhat.com>
Date: Fri, 21 Feb 2014 21:50:52 +0000 (-0500)
Subject: re PR c++/60252 ([c++11] ICE with invalid variable-length array in lambda parameter)
X-Git-Tag: releases/gcc-4.9.0~759
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7b67047c79d2ea6867ed15b6441960219d77f29;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8e4a2a0d9d1e..dd926daa4202 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 7fe235b57024..277dec6d2b9d 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);