From f6a8378651048912f39544cb748a530eb076f03d Mon Sep 17 00:00:00 2001
From: Ricardo Baratto <ricardo@aarno-labs.com>
Date: Tue, 26 Aug 2025 08:59:14 -0400
Subject: [PATCH] Revert "CFG: revert change for single-stmt block"

This reverts commit 9f6af5af1203cbd28d0b61be87607ca9cfc1a4ec.

This is a revert of a revert of b406023245464e670ec4f774656cf03558a8b83e

b406023245464e670ec4f774656cf03558a8b83e was causing some regression
test failures but that was because the patcher side of things had not
been merged.
---
 chb/app/Cfg.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/chb/app/Cfg.py b/chb/app/Cfg.py
index 09ba1d47..451db56b 100644
--- a/chb/app/Cfg.py
+++ b/chb/app/Cfg.py
@@ -477,8 +477,6 @@ def stmt_ast(
         fn = astfn.function
 
         def mk_block(stmts: List[AST.ASTStmt]) -> AST.ASTStmt:
-            if len(stmts) == 1 and not stmts[0].is_ast_instruction_sequence:
-                return stmts[0]
             return astree.mk_block(stmts)
 
         gotolabels: Set[str] = set() # this is both used and mutated by run_with_gotolabels()