Commit 2d7b55aa0ac30bd0e85cc43e22ef578c7a0d766c | zig

author	Matthew Borkowski <matthew.h.borkowski@gmail.com> 2021-10-19 03:45:18-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-10-19 13:48:09-04:00
log	2d7b55aa0ac30bd0e85cc43e22ef578c7a0d766c
tree	16190c4617d3d8b97c776343a8b7e5eb47195439
parent	135cb529def1d77e2e7e3edb641c37fb0cb47f2e

translate_c: prevent a while under an if from stealing the else

2 files changed, 40 insertions(+), 9 deletions(-)

src
- translate_c.zig
test
- run_translated_c.zig

src/translate_c.zig+23-9

 @@ -2808,16 +2808,18 @@ fn maybeBlockify(c: *Context, scope: *Scope, stmt: *const clang.Stmt) TransError
         .NullStmtClass,
         .WhileStmtClass,
         => return transStmt(c, scope, stmt, .unused),
-        else => {
+        else => return blockify(c, scope, stmt),
-            var block_scope = try Scope.Block.init(c, scope, false);
-            defer block_scope.deinit();
-            const result = try transStmt(c, &block_scope.base, stmt, .unused);
-            try block_scope.statements.append(result);
-            return block_scope.complete(c);
-        },
     }
 }
+fn blockify(c: *Context, scope: *Scope, stmt: *const clang.Stmt) TransError!Node {
+    var block_scope = try Scope.Block.init(c, scope, false);
+    defer block_scope.deinit();
+    const result = try transStmt(c, &block_scope.base, stmt, .unused);
+    try block_scope.statements.append(result);
+    return block_scope.complete(c);
+}
 fn transIfStmt(
     c: *Context,
     scope: *Scope,
 @@ -2835,9 +2837,21 @@ fn transIfStmt(
     const cond_expr = @ptrCast(*const clang.Expr, stmt.getCond());
     const cond = try transBoolExpr(c, &cond_scope.base, cond_expr, .used);
-    const then_body = try maybeBlockify(c, scope, stmt.getThen());
+    const then_stmt = stmt.getThen();
+    const else_stmt = stmt.getElse();
+    const then_class = then_stmt.getStmtClass();
+    // block needed to keep else statement from attaching to inner while
+    const must_blockify = (else_stmt != null) and switch (then_class) {
+        .DoStmtClass, .ForStmtClass, .WhileStmtClass => true,
+        else => false,
+    };
+    const then_body = if (must_blockify)
+        try blockify(c, scope, then_stmt)
+    else
+        try maybeBlockify(c, scope, then_stmt);
-    const else_body = if (stmt.getElse()) |expr|
+    const else_body = if (else_stmt) |expr|
         try maybeBlockify(c, scope, expr)
     else
         null;

test/run_translated_c.zig+17

...	@@ -1767,4 +1767,21 @@ pub fn addCases(cases: *tests.RunTranslatedCContext) void {	...	@@ -1767,4 +1767,21 @@ pub fn addCases(cases: *tests.RunTranslatedCContext) void {
1767	\\ return 0;	1767	\\ return 0;
1768	\\}	1768	\\}
1769	, "");	1769	, "");
		1770
		1771	cases.add("Ensure while loop under an if doesn't steal the else. Issue #9953",
		1772	\\#include <stdio.h>
		1773	\\void doWork(int id) { }
		1774	\\int reallyDelete(int id) { printf("deleted %d\n", id); return 1; }
		1775	\\int process(int id, int n, int delete) {
		1776	\\ if(!delete)
		1777	\\ while(n-- > 0) doWork(id);
		1778	\\ else
		1779	\\ return reallyDelete(id);
		1780	\\ return 0;
		1781	\\}
		1782	\\int main(void) {
		1783	\\ process(99, 3, 0);
		1784	\\ return 0;
		1785	\\}
		1786	, "");
1770	}	1787	}