From: Iain Sandoe <iain@sandoe.co.uk>
Date: Wed, 23 Jun 2021 07:13:22 +0000 (+0100)
Subject: coroutines: Fix a typo in rewriting the function.
X-Git-Tag: basepoints/gcc-13~6086
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d5db79a61af150cba48612c9fbc3267262adb93;p=thirdparty%2Fgcc.git

coroutines: Fix a typo in rewriting the function.

When amending the function re-write code, I made a typo in
the block connections.  This has not shown up in any test
fails (as far as can be seen) but is a regression in debug
info.

Fixed thus.

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

gcc/cp/ChangeLog:

	* coroutines.cc
	(coro_rewrite_function_body): Connect the replacement
	function block to the block nest correctly.
---

diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc
index a1b0b31f4974..f5ae2d6d101e 100644
--- a/gcc/cp/coroutines.cc
+++ b/gcc/cp/coroutines.cc
@@ -4055,8 +4055,8 @@ coro_rewrite_function_body (location_t fn_start, tree fnbody, tree orig,
       BIND_EXPR_BLOCK (first) = replace_blk;
       /* The top block has one child, so far, and we have now got a 
 	 superblock.  */
-      BLOCK_SUPERCONTEXT (block) = top_block;
-      BLOCK_SUBBLOCKS (top_block) = block;
+      BLOCK_SUPERCONTEXT (replace_blk) = top_block;
+      BLOCK_SUBBLOCKS (top_block) = replace_blk;
     }
 
   /* Wrap the function body in a try {} catch (...) {} block, if exceptions