mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

astgen: finishThenElseBlock: fix putting store_to_block_ptr in wrong block

Browse Source
This commit is contained in:
Andrew Kelley 2021-03-23 15:32:25 -07:00
parent af73f79490
commit aa46a705ad
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/astgen.zig
View File

@ -1732,9 +1732,10 @@ fn orelseCatchExpr(
return finishThenElseBlock(
mod,
&block_scope,
scope,
rl,
node,
&block_scope,
&then_scope,
&else_scope,
condbr,
@ -1750,9 +1751,10 @@ fn orelseCatchExpr(
fn finishThenElseBlock(
mod: *Module,
block_scope: *Scope.GenZir,
parent_scope: *Scope,
rl: ResultLoc,
node: ast.Node.Index,
block_scope: *Scope.GenZir,
then_scope: *Scope.GenZir,
else_scope: *Scope.GenZir,
condbr: zir.Inst.Index,
@ -1830,7 +1832,7 @@ fn finishThenElseBlock(
const block_ref = wzc.ref_start_index + main_block;
switch (rl) {
.ref => return block_ref,
else => return rvalue(mod, &block_scope.base, rl, block_ref, node),
else => return rvalue(mod, parent_scope, rl, block_ref, node),
}
},
}
@ -2066,9 +2068,10 @@ fn ifExpr(
return finishThenElseBlock(
mod,
&block_scope,
scope,
rl,
node,
&block_scope,
&then_scope,
&else_scope,
condbr,
@ -2277,9 +2280,10 @@ fn whileExpr(
}
return finishThenElseBlock(
mod,
&loop_scope,
scope,
rl,
node,
&loop_scope,
&then_scope,
&else_scope,
condbr,
@ -2476,9 +2480,10 @@ fn forExpr(
}
return finishThenElseBlock(
mod,
&loop_scope,
scope,
rl,
node,
&loop_scope,
&then_scope,
&else_scope,
condbr,