Feature(compiler): IfStatementCodeGenerator - Support terminator in e…

…lse branch
ovr · Jan 15, 2019 · 6c42b5c · 6c42b5c
1 parent 41a5023
commit 6c42b5c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/backend/llvm/code-generation/if-statement.ts b/src/backend/llvm/code-generation/if-statement.ts
@@ -28,7 +28,9 @@ export class IfStatementCodeGenerator implements NodeGenerateInterface<ts.IfStat
             builder.setInsertionPoint(negativeBlock);
             passNode(node.elseStatement, ctx, builder);
 
-            builder.createBr(next);
+            if (!negativeBlock.getTerminator()) {
+                builder.createBr(next);
+            }
         } else {
             emitCondition(
                 node.expression,

diff --git a/tests/snapshots/general/branch.ts b/tests/snapshots/general/branch.ts
@@ -0,0 +1,19 @@
+
+{
+    function compareWithReturnInElse(left: number, right: number): string {
+        console_log("compareWithReturnInElse");
+        console_log(left);
+        console_log(right);
+
+        if (left == right) {
+
+        } else {
+            return "false";
+        }
+
+        return "true";
+    }
+
+    compareWithReturnInElse(1, 5);
+    compareWithReturnInElse(5, 1);
+}