diff options
| author | Jason Merrill <jason@redhat.com> | 2009-10-23 16:09:45 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-10-23 16:09:45 -0400 |
| commit | 92de1b370201aa7ea0a3cf0343840d08445293ba (patch) | |
| tree | 38fcc742e378815a9cd462bc6dc91f806b606ff1 | |
| parent | 9660afe0427e38f5d98ceebac34cd780b9167bb0 (diff) | |
| download | gcc-92de1b370201aa7ea0a3cf0343840d08445293ba.zip gcc-92de1b370201aa7ea0a3cf0343840d08445293ba.tar.gz gcc-92de1b370201aa7ea0a3cf0343840d08445293ba.tar.bz2 | |
* semantics.c (lambda_expr_this_capture): Use thisify_lambda_field.
From-SVN: r153512
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e0bf4f2..70cdad3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2009-10-23 Jason Merrill <jason@redhat.com> + * semantics.c (lambda_expr_this_capture): Use thisify_lambda_field. + * semantics.c (outer_lambda_capture_p): New fn. (thisify_lambda_field): Factor out... (add_default_capture): ...from here. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 3e39f37..417c15f 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -5709,10 +5709,7 @@ lambda_expr_this_capture (tree lambda) { /* An outer lambda has already captured 'this'. */ tree cap = LAMBDA_EXPR_THIS_CAPTURE (lambda); - tree lthis - = cp_build_indirect_ref (DECL_ARGUMENTS (containing_function), - "", tf_warning_or_error); - init = finish_non_static_data_member (cap, lthis, NULL_TREE); + init = thisify_lambda_field (cap); break; } |