diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2023-04-01 21:53:51 +0530 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2023-04-30 09:27:41 +0100 |
| commit | 66e43c2387402f1fd48c71fe10275fa8f4c427d5 (patch) | |
| tree | 7159073cb08549a40585aa8e67d1e4b21688102d | |
| parent | b7e75cdb218f25708b8b1aa3f4b138d88187491f (diff) | |
| download | gcc-66e43c2387402f1fd48c71fe10275fa8f4c427d5.tar.gz | |
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)
| -rw-r--r-- | gcc/cp/coroutines.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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; } |