diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2023-04-01 21:53:51 +0530 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2023-05-16 20:07:19 +0100 |
| commit | 44369553715df0b443ac7c2aa4703f53c932df62 (patch) | |
| tree | 134f6d67e292524c5d681432477a10125ea522fe | |
| parent | 72f004746d87f01e5e3872af3214e3fa1b48dfa8 (diff) | |
| download | gcc-44369553715df0b443ac7c2aa4703f53c932df62.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 4cb0db315aa..34d9d3e7d61 100644 --- a/gcc/cp/coroutines.cc +++ b/gcc/cp/coroutines.cc @@ -4081,6 +4081,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; } |