forked from M-Labs/nac3
core/stmt: Do not generate jumps if bb is already terminated
Future-proofs gen_*_callback functions in case other codegen functions will delegate to it in the future.
This commit is contained in:
parent
52c731c312
commit
e7fca67786
|
@ -509,28 +509,32 @@ pub fn gen_for_callback<'ctx, 'a, G, I, InitFn, CondFn, BodyFn, UpdateFn>(
|
||||||
|
|
||||||
ctx.builder.build_unconditional_branch(init_bb).unwrap();
|
ctx.builder.build_unconditional_branch(init_bb).unwrap();
|
||||||
|
|
||||||
let loop_var = {
|
|
||||||
ctx.builder.position_at_end(init_bb);
|
ctx.builder.position_at_end(init_bb);
|
||||||
let result = init(generator, ctx)?;
|
let loop_var = init(generator, ctx)?;
|
||||||
|
if !ctx.is_terminated() {
|
||||||
ctx.builder.build_unconditional_branch(cond_bb).unwrap();
|
ctx.builder.build_unconditional_branch(cond_bb).unwrap();
|
||||||
|
}
|
||||||
result
|
|
||||||
};
|
|
||||||
|
|
||||||
ctx.builder.position_at_end(cond_bb);
|
ctx.builder.position_at_end(cond_bb);
|
||||||
let cond = cond(generator, ctx, loop_var.clone())?;
|
let cond = cond(generator, ctx, loop_var.clone())?;
|
||||||
assert_eq!(cond.get_type().get_bit_width(), ctx.ctx.bool_type().get_bit_width());
|
assert_eq!(cond.get_type().get_bit_width(), ctx.ctx.bool_type().get_bit_width());
|
||||||
|
if !ctx.is_terminated() {
|
||||||
ctx.builder
|
ctx.builder
|
||||||
.build_conditional_branch(cond, body_bb, cont_bb)
|
.build_conditional_branch(cond, body_bb, cont_bb)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
ctx.builder.position_at_end(body_bb);
|
ctx.builder.position_at_end(body_bb);
|
||||||
body(generator, ctx, loop_var.clone())?;
|
body(generator, ctx, loop_var.clone())?;
|
||||||
|
if !ctx.is_terminated() {
|
||||||
ctx.builder.build_unconditional_branch(update_bb).unwrap();
|
ctx.builder.build_unconditional_branch(update_bb).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
ctx.builder.position_at_end(update_bb);
|
ctx.builder.position_at_end(update_bb);
|
||||||
update(generator, ctx, loop_var)?;
|
update(generator, ctx, loop_var)?;
|
||||||
|
if !ctx.is_terminated() {
|
||||||
ctx.builder.build_unconditional_branch(cond_bb).unwrap();
|
ctx.builder.build_unconditional_branch(cond_bb).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
ctx.builder.position_at_end(cont_bb);
|
ctx.builder.position_at_end(cont_bb);
|
||||||
ctx.loop_target = loop_bb;
|
ctx.loop_target = loop_bb;
|
||||||
|
|
Loading…
Reference in New Issue