public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Iain D Sandoe <iains@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-9502] c++, coroutines: Fix block nests when the function has no top-level bind. Date: Sun, 30 Apr 2023 08:27:50 +0000 (GMT) [thread overview] Message-ID: <20230430082750.AF79C385843A@sourceware.org> (raw) https://gcc.gnu.org/g:66e43c2387402f1fd48c71fe10275fa8f4c427d5 commit r12-9502-g66e43c2387402f1fd48c71fe10275fa8f4c427d5 Author: Iain Sandoe <iain@sandoe.co.uk> Date: Sat Apr 1 21:53:51 2023 +0530 c++, coroutines: Fix block nests when the function has no top-level bind. When the function contains no local vars and also no nested scopes, there is no top-level bind expression. Because the rewritten coroutine body will require both local vars and contain nested scopes, we add a bind expression to such functions. When this was done the necessary scope blocks were omitted which leads to disconnected function content. Fixed by adding a new block to the added bind expression. Signed-off-by: Iain Sandoe <iain@sandoe.co.uk> gcc/cp/ChangeLog: * coroutines.cc (coro_rewrite_function_body): Ensure that added bind expressions have scope blocks. (cherry picked from commit a8d7631d333c22e38a067d32d11fd2b60cf1d960) Diff: --- gcc/cp/coroutines.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc index 03ba3f6aa26..85a760d8220 100644 --- a/gcc/cp/coroutines.cc +++ b/gcc/cp/coroutines.cc @@ -4109,6 +4109,10 @@ coro_rewrite_function_body (location_t fn_start, tree fnbody, tree orig, tree bind_wrap = build3_loc (fn_start, BIND_EXPR, void_type_node, NULL, NULL, NULL); BIND_EXPR_BODY (bind_wrap) = fnbody; + /* Ensure we have a block to connect up the scopes. */ + tree new_blk = make_node (BLOCK); + BIND_EXPR_BLOCK (bind_wrap) = new_blk; + BLOCK_SUBBLOCKS (top_block) = new_blk; fnbody = bind_wrap; }
reply other threads:[~2023-04-30 8:27 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230430082750.AF79C385843A@sourceware.org \ --to=iains@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).