From: Jason Merrill <jason@redhat.com>
Date: Wed, 10 Feb 2010 22:45:07 +0000 (-0500)
Subject: re PR c++/41896 ([c++0x] Segfault because of a nested lambda function)
X-Git-Tag: releases/gcc-4.5.0~822
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cb95a6ade9618f6056c251d07617a7a4c9c51e2;p=thirdparty%2Fgcc.git

re PR c++/41896 ([c++0x] Segfault because of a nested lambda function)

	PR c++/41896
	* semantics.c (outer_lambda_capture_p): Use current_function_decl
	instead of current_class_type.

From-SVN: r156673
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 11ec213bc8a6..7a6e78a20cc0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-10  Jason Merrill  <jason@redhat.com>
+
+	PR c++/41896
+	* semantics.c (outer_lambda_capture_p): Use current_function_decl
+	instead of current_class_type.
+
 2010-02-10  Jason Merrill  <jason@redhat.com>
 
 	PR c++/42983, core issue 906
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index f8ced6fd5493..796b789199b6 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2714,8 +2714,9 @@ outer_lambda_capture_p (tree decl)
 {
   return (TREE_CODE (decl) == FIELD_DECL
 	  && LAMBDA_TYPE_P (DECL_CONTEXT (decl))
-	  && (!current_class_type
-	      || !DERIVED_FROM_P (DECL_CONTEXT (decl), current_class_type)));
+	  /* Using current_class_type here causes problems with uses in a
+	     nested lambda-introducer; see 41896.  */
+	  && DECL_CONTEXT (current_function_decl) != DECL_CONTEXT (decl));
 }
 
 /* ID_EXPRESSION is a representation of parsed, but unprocessed,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1ddd79182957..b7ea3a296476 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2010-02-10  Jason Merrill  <jason@redhat.com>
 
+	PR c++/41896
+	* g++.dg/cpp0x/lambda/lambda-nested3.C: New.
+
 	PR c++/42983, core issue 906
 	* g++.dg/cpp0x/defaulted15.C: Add virtualness test.
 	* g++.dg/cpp0x/defaulted9.C: Move virtual default outside class.
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested3.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested3.C
new file mode 100644
index 000000000000..2cc6f9640832
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested3.C
@@ -0,0 +1,12 @@
+// PR c++/41896
+// { dg-options "-std=c++0x" }
+
+void nested_lambda()
+{
+  float val;
+
+  [val]()
+    {
+      [val](){};
+    };
+}