OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

From-SVN: r156673
This commit is contained in:
Jason Merrill 2010-02-10 17:45:07 -05:00 committed by Jason Merrill
parent f1c3cf3c93
commit 2cb95a6ade
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -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> 2010-02-10 Jason Merrill <jason@redhat.com>
PR c++/42983, core issue 906 PR c++/42983, core issue 906

5
gcc/cp/semantics.c
View File

@ -2714,8 +2714,9 @@ outer_lambda_capture_p (tree decl)
{ {
return (TREE_CODE (decl) == FIELD_DECL return (TREE_CODE (decl) == FIELD_DECL
&& LAMBDA_TYPE_P (DECL_CONTEXT (decl)) && LAMBDA_TYPE_P (DECL_CONTEXT (decl))
&& (!current_class_type /* Using current_class_type here causes problems with uses in a
|| !DERIVED_FROM_P (DECL_CONTEXT (decl), current_class_type))); nested lambda-introducer; see 41896. */
&& DECL_CONTEXT (current_function_decl) != DECL_CONTEXT (decl));
} }
/* ID_EXPRESSION is a representation of parsed, but unprocessed, /* ID_EXPRESSION is a representation of parsed, but unprocessed,

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2010-02-10 Jason Merrill <jason@redhat.com> 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 PR c++/42983, core issue 906
* g++.dg/cpp0x/defaulted15.C: Add virtualness test. * g++.dg/cpp0x/defaulted15.C: Add virtualness test.
* g++.dg/cpp0x/defaulted9.C: Move virtual default outside class. * g++.dg/cpp0x/defaulted9.C: Move virtual default outside class.

12
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested3.C Normal file
View File

@ -0,0 +1,12 @@
// PR c++/41896
// { dg-options "-std=c++0x" }
void nested_lambda()
{
float val;
[val]()
{
[val](){};
};
}