Mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-05-29 12:27:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

AstGen: fix loop control flow applying to wrong loop

Browse Source 
In the case of 'continue' or 'break' inside the 'else' block of a
'while' or 'for' loop.

Closes #12109
This commit is contained in:
Andrew Kelley
2022-07-13 15:59:46 -07:00
parent 1fee9eac8b
commit fad95741db
5 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AstGen.zig
+8
View File
@@ -5795,6 +5795,10 @@ fn whileExpr(
break :s &else_scope.base;
}
};
// Remove the continue block and break block so that `continue` and `break`
// control flow apply to outer loops; not this one.
loop_scope.continue_block = 0;
loop_scope.break_block = 0;
const e = try expr(&else_scope, sub_scope, loop_scope.break_result_loc, else_node);
if (!else_scope.endsWithNoReturn()) {
loop_scope.break_count += 1;
@@ -5994,6 +5998,10 @@ fn forExpr(
result: Zir.Inst.Ref,
} = if (else_node != 0) blk: {
const sub_scope = &else_scope.base;
// Remove the continue block and break block so that `continue` and `break`
// control flow apply to outer loops; not this one.
loop_scope.continue_block = 0;
loop_scope.break_block = 0;
const else_result = try expr(&else_scope, sub_scope, loop_scope.break_result_loc, else_node);
if (!else_scope.endsWithNoReturn()) {
loop_scope.break_count += 1;