diff options
| author | Jason Merrill <jason@redhat.com> | 2017-09-28 15:39:32 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-09-28 15:39:32 -0400 |
| commit | 697a7a575de01835b3941e6b6d25b940033301d5 (patch) | |
| tree | c8985e016bcb5b8322adb1fc5c653500fe51f82c /gcc/cp/lambda.c | |
| parent | 6ad0466f585aff427339b66e2228ac99d1d595bf (diff) | |
| download | gcc-697a7a575de01835b3941e6b6d25b940033301d5.zip gcc-697a7a575de01835b3941e6b6d25b940033301d5.tar.gz gcc-697a7a575de01835b3941e6b6d25b940033301d5.tar.bz2 | |
Small lambda fixes.
* call.c (build_special_member_call): Use the return value of
mark_lvalue_use.
* decl.c (compute_array_index_type): Likewise.
* parser.c (cp_parser_oacc_wait_list): Likewise.
* lambda.c (is_normal_capture_proxy): Handle *this capture.
(add_capture): Clarify internal_error message.
From-SVN: r253264
Diffstat (limited to 'gcc/cp/lambda.c')
| -rw-r--r-- | gcc/cp/lambda.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index e441256..695666a 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -283,6 +283,8 @@ is_normal_capture_proxy (tree decl) if (val == error_mark_node) return true; + if (TREE_CODE (val) == ADDR_EXPR) + val = TREE_OPERAND (val, 0); gcc_assert (TREE_CODE (val) == COMPONENT_REF); val = TREE_OPERAND (val, 1); return DECL_NORMAL_CAPTURE_P (val); @@ -592,7 +594,8 @@ add_capture (tree lambda, tree id, tree orig_init, bool by_reference_p, && current_class_type == LAMBDA_EXPR_CLOSURE (lambda)) { if (COMPLETE_TYPE_P (current_class_type)) - internal_error ("trying to capture %qD after closure is complete", id); + internal_error ("trying to capture %qD in instantiation of " + "generic lambda", id); finish_member_declaration (member); } |