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

select to phi in if expression

Browse Source
This commit is contained in:
Ginger Bill
2016-12-30 16:31:04 +00:00
parent 2ecafda1d3
commit 6748f305db
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ssa.c
+8 -5
View File
@@ -2654,6 +2654,9 @@ ssaValue *ssa_build_single_expr(ssaProcedure *proc, AstNode *expr, TypeAndValue
ssa_build_stmt(proc, ie->init); ssa_build_stmt(proc, ie->init);
} }
ssaValueArray edges = {0};
array_init_reserve(&edges, proc->module->allocator, 2);
GB_ASSERT(ie->else_expr != NULL); GB_ASSERT(ie->else_expr != NULL);
ssaBlock *then = ssa_add_block(proc, expr, "if.then"); ssaBlock *then = ssa_add_block(proc, expr, "if.then");
ssaBlock *done = ssa_add_block(proc, expr, "if.done"); // NOTE(bill): Append later ssaBlock *done = ssa_add_block(proc, expr, "if.done"); // NOTE(bill): Append later
@@ -2662,24 +2665,24 @@ ssaValue *ssa_build_single_expr(ssaProcedure *proc, AstNode *expr, TypeAndValue
ssaValue *cond = ssa_build_cond(proc, ie->cond, then, else_); ssaValue *cond = ssa_build_cond(proc, ie->cond, then, else_);
proc->curr_block = then; proc->curr_block = then;
ssaValue *iv = NULL;
ssaValue *ev = NULL;
ssa_open_scope(proc); ssa_open_scope(proc);
iv = ssa_build_expr(proc, ie->body); array_add(&edges, ssa_build_expr(proc, ie->body));
ssa_close_scope(proc, ssaDeferExit_Default, NULL); ssa_close_scope(proc, ssaDeferExit_Default, NULL);
ssa_emit_jump(proc, done); ssa_emit_jump(proc, done);
proc->curr_block = else_; proc->curr_block = else_;
ssa_open_scope(proc); ssa_open_scope(proc);
ev = ssa_build_expr(proc, ie->else_expr); array_add(&edges, ssa_build_expr(proc, ie->else_expr));
ssa_close_scope(proc, ssaDeferExit_Default, NULL); ssa_close_scope(proc, ssaDeferExit_Default, NULL);
ssa_emit_jump(proc, done); ssa_emit_jump(proc, done);
proc->curr_block = done; proc->curr_block = done;
return ssa_emit_select(proc, cond, iv, ev); Type *type = type_of_expr(proc->module->info, expr);
return ssa_emit(proc, ssa_make_instr_phi(proc, edges, type));
case_end; case_end;
case_ast_node(ge, GiveExpr, expr); case_ast_node(ge, GiveExpr, expr);