From 264c757d66f7b8c469b127cdb64ec9b18f385552 Mon Sep 17 00:00:00 2001
From: lemon <lsof@mailbox.org>
Date: Mon, 29 May 2023 14:35:18 +0200
Subject: bugfix with if true branch ending in return

---
 parse.c | 24 ++++++++++++------------
 test.c  |  3 ++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/parse.c b/parse.c
index ceef1f2..e86663a 100644
--- a/parse.c
+++ b/parse.c
@@ -1352,7 +1352,7 @@ static void block(struct parser *pr, struct function *fn);
 static bool /* return 1 if stmt is terminating (all codepaths return) */
 stmt(struct parser *pr, struct function *fn)
 {
-   struct block *t, *f, *end, *begin;
+   struct block *tr, *fl, *end, *begin;
    struct expr ex;
    union irref r;
    bool terminates = 0;
@@ -1380,25 +1380,25 @@ stmt(struct parser *pr, struct function *fn)
       expect(pr, ')', NULL);
       if (!isscalar(ex.ty))
          error(&ex.span, "'if' condition is not a scalar (%ty)", ex.ty);
-      t = f = end = NULL;
+      tr = fl = end = NULL;
       EMITS {
-         t = newblk(fn);
-         f = newblk(fn);
+         tr = newblk(fn);
+         fl = newblk(fn);
          r = exprvalue(fn, &ex);
          EMITS {
-            putjump(fn, Jbcnd, r, t, f);
-            useblk(fn, t);
+            putjump(fn, Jbcnd, r, tr, fl);
+            useblk(fn, tr);
          }
       }
       terminates = stmt(pr, fn);
       if (!match(pr, NULL, TKWelse)) {
-         EMITS putjump(fn, Jb, NOREF, f, NULL);
-         end = f;
+         end = fl;
+         EMITS if (!terminates) putjump(fn, Jb, NOREF, end, NULL);
          terminates = 0;
       } else {
          EMITS {
             if (!terminates) putjump(fn, Jb, NOREF, end = newblk(fn), NULL);
-            useblk(fn, f);
+            useblk(fn, fl);
          }
          terminates &= stmt(pr, fn);
          EMITS {
@@ -1414,15 +1414,15 @@ stmt(struct parser *pr, struct function *fn)
       expect(pr, ')', NULL);
       if (!isscalar(ex.ty))
          error(&ex.span, "'while' condition is not a scalar (%ty)", ex.ty);
-      t = begin = end = NULL;
+      tr = begin = end = NULL;
       EMITS {
          begin = newblk(fn);
          putjump(fn, Jb, NOREF, begin, NULL);
          useblk(fn, begin);
          r = exprvalue(fn, &ex);
          EMITS {
-            putjump(fn, Jbcnd, r, t = newblk(fn), end = newblk(fn));
-            useblk(fn, t);
+            putjump(fn, Jbcnd, r, tr = newblk(fn), end = newblk(fn));
+            useblk(fn, tr);
          }
       }
       terminates = stmt(pr, fn);
diff --git a/test.c b/test.c
index 9a3aafb..ff9b430 100644
--- a/test.c
+++ b/test.c
@@ -36,7 +36,8 @@ int foop(struct foo *foo) {
     ++foo->n0.n1.n2.ww;
     int xy = (*foo).xy;
     foo->flex[2] *= 5;
-    if (foo->x)return xy; else return foo->y;
+    if (foo->x)return xy;
+    return foo->y;
 }
 
 int abs(int x){
-- 
cgit v1.2.3