[PATCH olang] codegen: x86_64: add support to else statement

[PATCH olang] codegen: x86_64: add support to else statement

[Carlos Maniero]

Signed-off-by: Carlos Maniero <carlos@maniero.me>
---
 src/codegen_linux_x86_64.c                     | 11 +++++++++++
 tests/integration/tests/0023_else_statement.ol |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/src/codegen_linux_x86_64.c b/src/codegen_linux_x86_64.c
index 958c46e..8ed127c 100644
--- a/src/codegen_linux_x86_64.c
+++ b/src/codegen_linux_x86_64.c
@@ -324,8 +324,10 @@ codegen_linux_x86_64_emit_block(FILE *out, ast_block_t *block)
 
                 ast_node_t *cond = if_stmt.cond;
                 ast_node_t *then = if_stmt.then;
+                ast_node_t *_else = if_stmt._else;
 
                 size_t end_if_label = codegen_linux_x86_64_get_next_label();
+                size_t end_else_label = codegen_linux_x86_64_get_next_label();
 
                 codegen_linux_x86_64_emit_expression(out, cond);
                 fprintf(out, "    cmp $1, %%rax\n");
@@ -335,8 +337,17 @@ codegen_linux_x86_64_emit_block(FILE *out, ast_block_t *block)
                 ast_block_t then_block = then->as_block;
 
                 codegen_linux_x86_64_emit_block(out, &then_block);
+                fprintf(out, "    jmp .L%ld\n", end_else_label);
 
                 fprintf(out, ".L%ld:\n", end_if_label);
+
+                if (_else != NULL) {
+                    ast_block_t else_block = _else->as_block;
+                    codegen_linux_x86_64_emit_block(out, &else_block);
+                }
+
+                fprintf(out, ".L%ld:\n", end_else_label);
+
                 break;
             }
             default: {
diff --git a/tests/integration/tests/0023_else_statement.ol b/tests/integration/tests/0023_else_statement.ol
index a741537..fafb22e 100644
--- a/tests/integration/tests/0023_else_statement.ol
+++ b/tests/integration/tests/0023_else_statement.ol
@@ -21,6 +21,10 @@ fn main(): u32 {
   }
 }
 
+# TEST test_compile(exit_code=0)
+
+# TEST test_run_binary(exit_code=0)
+
 # TEST test_contains_tokens WITH
 # ./tests/0023_else_statement.ol:19:5: <else>
 # END

base-commit: 6d2288e9adf715b301eb62b9287b103a37353c9c
-- 
2.34.1

Re: [PATCH olang] codegen: x86_64: add support to else statement

[Johnny Richard]

Great work, thanks and applied!

Build: https://builds.sr.ht/~johnnyrichard/job/1323756

To git.sr.ht:~johnnyrichard/olang
   6d2288e..a9c75da  HEAD -> main