procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/56699 (Failed for sizeof (non-static member) in lambda expression)

Browse source 
PR c++/56699
	* semantics.c (maybe_resolve_dummy): Make sure that the enclosing
	class is derived from the type of the object.

From-SVN: r197069
This commit is contained in:
Jason Merrill 2013-03-25 18:06:36 -04:00 • committed by Jason Merrill
parent b85db96a63
commit f02296ddb9
3 changed files with 35 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,4 +1,8 @@
2013-03-23 Jason Merrill <jason@redhat.com>
2013-03-25 Jason Merrill <jason@redhat.com>
PR c++/56699
* semantics.c (maybe_resolve_dummy): Make sure that the enclosing
class is derived from the type of the object.
PR c++/52014
* semantics.c (lambda_expr_this_capture): Don't capture 'this' in

3
gcc/cp/semantics.c
View file

@ -9565,7 +9565,8 @@ maybe_resolve_dummy (tree object)
if (type != current_class_type
&& current_class_type
&& LAMBDA_TYPE_P (current_class_type))
&& LAMBDA_TYPE_P (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);

28
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this16.C Normal file
View file

@ -0,0 +1,28 @@
// PR c++/56699
// { dg-require-effective-target c++11 }
struct A
{
int a;
};
struct T
{
int x;
T() : x([]{
sizeof(::A::a);
return 0;
}())
{}
};
struct B
{
int a;
};
void f()
{
[]{sizeof(B::a);};
}