core: Fix restoration of loop target in try statement

old_loop_target is only assigned if ctx.loop_target is overwritten,
meaning that if ctx.loop_target is never overwritten, ctx.loop_target
will always be overwritten to None.

We fix this by only restoring from old_loop_target if we previously
assigned to old_loop_target.
This commit is contained in:
David Mak 2023-09-21 16:17:29 +08:00
parent 2a38d5160e
commit 48c6498d1f
3 changed files with 38 additions and 3 deletions

View File

@ -808,8 +808,7 @@ pub fn gen_try<'ctx, 'a, G: CodeGenerator>(
ctx.outer_catch_clauses = old_clauses; ctx.outer_catch_clauses = old_clauses;
ctx.unwind_target = old_unwind; ctx.unwind_target = old_unwind;
ctx.return_target = old_return; ctx.return_target = old_return;
ctx.loop_target = old_loop_target; ctx.loop_target = old_loop_target.or(ctx.loop_target).take();
old_loop_target = None;
let old_unwind = if !finalbody.is_empty() { let old_unwind = if !finalbody.is_empty() {
let final_landingpad = ctx.ctx.append_basic_block(current_fun, "try.catch.final"); let final_landingpad = ctx.ctx.append_basic_block(current_fun, "try.catch.final");
@ -930,7 +929,7 @@ pub fn gen_try<'ctx, 'a, G: CodeGenerator>(
} }
ctx.unwind_target = old_unwind; ctx.unwind_target = old_unwind;
ctx.loop_target = old_loop_target; ctx.loop_target = old_loop_target.or(ctx.loop_target).take();
ctx.return_target = old_return; ctx.return_target = old_return;
ctx.builder.position_at_end(landingpad); ctx.builder.position_at_end(landingpad);

View File

@ -97,6 +97,9 @@ pub extern "C" fn __nac3_raise(state: u32, exception_object: u32, context: u32)
exit(101); exit(101);
} }
#[no_mangle]
pub extern "C" fn __nac3_end_catch() {}
extern "C" { extern "C" {
fn run() -> i32; fn run() -> i32;
} }

View File

@ -0,0 +1,33 @@
# Break within try statement within a loop
# Taken from https://book.pythontips.com/en/latest/for_-_else.html
@extern
def output_int32(x: int32):
...
@extern
def output_float64(x: float):
...
@extern
def output_str(x: str):
...
def run() -> int32:
for n in range(2, 10):
for x in range(2, n):
try:
if n % x == 0:
output_int32(n)
output_str(" equals ")
output_int32(x)
output_str(" * ")
output_float64(n / x)
except: # Assume this is intended to catch x == 0
break
else:
# loop fell through without finding a factor
output_int32(n)
output_str(" is a prime number")
return 0