diff options
| author | Jason Merrill <jason@redhat.com> | 2011-06-17 16:08:01 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-06-17 16:08:01 -0400 |
| commit | 61ca4737a85b646c6f4f28e5a49e4f89fa44106b (patch) | |
| tree | 1cc558a7e679f551ed8af13589db5f793e8cd923 /gcc/cp/pt.c | |
| parent | 7e7666aed8caa20d3351147e6875292ca27cf1d9 (diff) | |
| download | gcc-61ca4737a85b646c6f4f28e5a49e4f89fa44106b.zip gcc-61ca4737a85b646c6f4f28e5a49e4f89fa44106b.tar.gz gcc-61ca4737a85b646c6f4f28e5a49e4f89fa44106b.tar.bz2 | |
re PR c++/43912 ([C++0x] lambda debug info does not describe captured variables)
PR c++/43912
Generate proxy VAR_DECLs for better lambda debug info.
* cp-tree.h (FUNCTION_NEEDS_BODY_BLOCK): Add lambda operator().
(LAMBDA_EXPR_PENDING_PROXIES): New.
(struct tree_lambda_expr): Add pending_proxies.
* name-lookup.c (pushdecl_maybe_friend_1): Handle capture shadowing.
(qualify_lookup): Use is_lambda_ignored_entity.
* parser.c (cp_parser_lambda_expression): Don't adjust field names.
Call insert_pending_capture_proxies.
(cp_parser_lambda_introducer): Use this_identifier.
(cp_parser_lambda_declarator_opt): Call the object parameter
of the op() "__closure" instead of "this".
(cp_parser_lambda_body): Call build_capture_proxy.
* semantics.c (build_capture_proxy, is_lambda_ignored_entity): New.
(insert_pending_capture_proxies, insert_capture_proxy): New.
(is_normal_capture_proxy, is_capture_proxy): New.
(add_capture): Add __ to field names here, return capture proxy.
(add_default_capture): Use this_identifier, adjust to expect
add_capture to return a capture proxy.
(outer_lambda_capture_p, thisify_lambda_field): Remove.
(finish_id_expression, lambda_expr_this_capture): Adjust.
(build_lambda_expr): Initialize LAMBDA_EXPR_PENDING_PROXIES.
* pt.c (tsubst_copy_and_build): Check that LAMBDA_EXPR_PENDING_PROXIES
is null.
From-SVN: r175158
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index ca4f955..85f2749 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13500,7 +13500,8 @@ tsubst_copy_and_build (tree t, = RECUR (LAMBDA_EXPR_CAPTURE_LIST (t)); LAMBDA_EXPR_EXTRA_SCOPE (r) = RECUR (LAMBDA_EXPR_EXTRA_SCOPE (t)); - gcc_assert (LAMBDA_EXPR_THIS_CAPTURE (t) == NULL_TREE); + gcc_assert (LAMBDA_EXPR_THIS_CAPTURE (t) == NULL_TREE + && LAMBDA_EXPR_PENDING_PROXIES (t) == NULL); /* Do this again now that LAMBDA_EXPR_EXTRA_SCOPE is set. */ determine_visibility (TYPE_NAME (type)); |