ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix or_break code generation issue

Browse Source
This commit is contained in:
gingerBill
2023-09-30 18:58:28 +01:00
parent 1f643b5816
commit 3e0fd63682
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend_expr.cpp
+11 -21
View File
@@ -3327,38 +3327,28 @@ gb_internal lbValue lb_build_expr_internal(lbProcedure *p, Ast *expr) {
} }
} }
GB_ASSERT(block != nullptr);
lbValue lhs = {}; lbValue lhs = {};
lbValue rhs = {}; lbValue rhs = {};
lb_emit_try_lhs_rhs(p, be->expr, tv, &lhs, &rhs); lb_emit_try_lhs_rhs(p, be->expr, tv, &lhs, &rhs);
Type *type = default_type(tv.type); Type *type = default_type(tv.type);
if (lhs.value) {
lhs = lb_emit_conv(p, lhs, type);
} else if (type != nullptr && type != t_invalid) {
lhs = lb_const_nil(p->module, type);
}
lbBlock *then = lb_create_block(p, "or_branch.then"); lbBlock *then = lb_create_block(p, "or_branch.then");
lbBlock *done = lb_create_block(p, "or_branch.done"); // NOTE(bill): Append later
lbBlock *else_ = lb_create_block(p, "or_branch.else"); lbBlock *else_ = lb_create_block(p, "or_branch.else");
lb_emit_if(p, lb_emit_try_has_value(p, rhs), then, else_); lb_emit_if(p, lb_emit_try_has_value(p, rhs), then, else_);
lb_start_block(p, else_);
lb_emit_defer_stmts(p, lbDeferExit_Branch, block);
lb_emit_jump(p, block);
lb_start_block(p, then); lb_start_block(p, then);
lbValue res = {}; return lhs;
if (lhs.value) {
res = lb_emit_conv(p, lhs, type);
}
lb_emit_jump(p, done);
lb_start_block(p, else_);
if (lhs.value) {
res = lb_const_nil(p->module, type);
}
if (block != nullptr) {
lb_emit_defer_stmts(p, lbDeferExit_Branch, block);
}
lb_emit_jump(p, block);
lb_start_block(p, done);
return res;
case_end; case_end;
case_ast_node(ta, TypeAssertion, expr); case_ast_node(ta, TypeAssertion, expr);