PR c++/41896

	* semantics.c (outer_lambda_capture_p): Use current_function_decl
	instead of current_class_type.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156673 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 11ec213..7a6e78a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
 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
        * method.c (defaultable_fn_check): Check virtualness.
 

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index f8ced6f..796b789 100644 (file)
--- 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 1ddd791..b7ea3a2 100644 (file)
--- 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 (file)
index 0000000..2cc6f96
--- /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](){};
+    };
+}