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

re PR c++/63320 (bogus ‘this’ was not captured for this lambda function error)

Browse source 
PR c++/63320
	PR c++/60463
	PR c++/60755
	* lambda.c (maybe_resolve_dummy, lambda_expr_this_capture): Handle
	not finding 'this'.

From-SVN: r215478
This commit is contained in:
Jason Merrill 2014-09-22 15:22:11 -04:00 • committed by Jason Merrill
parent 05424ee6ec
commit a546927c6a
4 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/cp/ChangeLog
View file

@ -1,3 +1,11 @@
2014-09-22 Jason Merrill <jason@redhat.com>
PR c++/63320
PR c++/60463
PR c++/60755
* lambda.c (maybe_resolve_dummy, lambda_expr_this_capture): Handle
not finding 'this'.
2014-09-22 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/62219

8
gcc/cp/lambda.c
View file

@ -724,7 +724,8 @@ lambda_expr_this_capture (tree lambda, bool add_capture_p)
if (!this_capture)
{
error ("%<this%> was not captured for this lambda function");
if (add_capture_p)
error ("%<this%> was not captured for this lambda function");
result = error_mark_node;
}
else
@ -768,8 +769,9 @@ maybe_resolve_dummy (tree object, bool add_capture_p)
/* In a lambda, need to go through 'this' capture. */
tree lam = CLASSTYPE_LAMBDA_EXPR (current_class_type);
tree cap = lambda_expr_this_capture (lam, add_capture_p);
object = build_x_indirect_ref (EXPR_LOCATION (object), cap,
RO_NULL, tf_warning_or_error);
if (cap != error_mark_node)
object = build_x_indirect_ref (EXPR_LOCATION (object), cap,
RO_NULL, tf_warning_or_error);
}
return object;

4
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice3.C
View file

@ -3,7 +3,7 @@
class Klass
{
unsigned int local;
unsigned int local; // { dg-error "non-static" }
public:
bool dostuff();
};
@ -11,7 +11,7 @@ public:
bool Klass::dostuff()
{
auto f = []() -> bool {
if (local & 1) { return true; } // { dg-error "not captured" }
if (local & 1) { return true; } // { dg-error "not captured|this location" }
return false;
};
}

11
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this19.C Normal file
View file

@ -0,0 +1,11 @@
// PR c++/63320
// { dg-do compile { target c++11 } }
class A {
static void addWindow();
static void activateWindow(void *);
};
void A::addWindow() {
int* action {};
[action] { activateWindow(action); };
}