occheung/nac3
1
0
Fork 0
forked from M-Labs/nac3
Code Issues Pull Requests Projects Releases Wiki Activity

core/stmt: Use BB of last statement in if-else in phi

Browse Source
This commit is contained in:
David Mak 2024-06-07 16:38:12 +08:00
parent 679656f9e1
commit 2d4329e23c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nac3core/src/codegen/stmt.rs
View File

@ -872,12 +872,14 @@ pub fn gen_if_else_expr_callback<'ctx, 'a, G, CondFn, ThenFn, ElseFn, R>(
ctx.builder.position_at_end(then_bb); ctx.builder.position_at_end(then_bb);
let then_val = then_fn(generator, ctx)?; let then_val = then_fn(generator, ctx)?;
let then_end_bb = ctx.builder.get_insert_block().unwrap();
if !ctx.is_terminated() { if !ctx.is_terminated() {
ctx.builder.build_unconditional_branch(end_bb).unwrap(); ctx.builder.build_unconditional_branch(end_bb).unwrap();
} }
ctx.builder.position_at_end(else_bb); ctx.builder.position_at_end(else_bb);
let else_val = else_fn(generator, ctx)?; let else_val = else_fn(generator, ctx)?;
let else_end_bb = ctx.builder.get_insert_block().unwrap();
if !ctx.is_terminated() { if !ctx.is_terminated() {
ctx.builder.build_unconditional_branch(end_bb).unwrap(); ctx.builder.build_unconditional_branch(end_bb).unwrap();
} }
@ -889,7 +891,7 @@ pub fn gen_if_else_expr_callback<'ctx, 'a, G, CondFn, ThenFn, ElseFn, R>(
assert_eq!(tv_ty, ev.as_basic_value_enum().get_type()); assert_eq!(tv_ty, ev.as_basic_value_enum().get_type());
let phi = ctx.builder.build_phi(tv_ty, "").unwrap(); let phi = ctx.builder.build_phi(tv_ty, "").unwrap();
phi.add_incoming(&[(&tv, then_bb), (&ev, else_bb)]); phi.add_incoming(&[(&tv, then_end_bb), (&ev, else_end_bb)]);
Some(phi.as_basic_value()) Some(phi.as_basic_value())
}, },