| ... | ... | @@ -4567,8 +4567,6 @@ fn tryExpr( |
| 4567 | 4567 | &else_scope, |
| 4568 | 4568 | condbr, |
| 4569 | 4569 | cond, |
| 4570 | | node, |
| 4571 | | node, |
| 4572 | 4570 | then_result, |
| 4573 | 4571 | else_result, |
| 4574 | 4572 | block, |
| ... | ... | @@ -4662,8 +4660,6 @@ fn orelseCatchExpr( |
| 4662 | 4660 | &else_scope, |
| 4663 | 4661 | condbr, |
| 4664 | 4662 | cond, |
| 4665 | | node, |
| 4666 | | node, |
| 4667 | 4663 | then_result, |
| 4668 | 4664 | else_result, |
| 4669 | 4665 | block, |
| ... | ... | @@ -4682,16 +4678,12 @@ fn finishThenElseBlock( |
| 4682 | 4678 | else_scope: *GenZir, |
| 4683 | 4679 | condbr: Zir.Inst.Index, |
| 4684 | 4680 | cond: Zir.Inst.Ref, |
| 4685 | | then_src: ast.Node.Index, |
| 4686 | | else_src: ast.Node.Index, |
| 4687 | 4681 | then_result: Zir.Inst.Ref, |
| 4688 | 4682 | else_result: Zir.Inst.Ref, |
| 4689 | 4683 | main_block: Zir.Inst.Index, |
| 4690 | 4684 | then_break_block: Zir.Inst.Index, |
| 4691 | 4685 | break_tag: Zir.Inst.Tag, |
| 4692 | 4686 | ) InnerError!Zir.Inst.Ref { |
| 4693 | | _ = then_src; |
| 4694 | | _ = else_src; |
| 4695 | 4687 | // We now have enough information to decide whether the result instruction should |
| 4696 | 4688 | // be communicated via result location pointer or break instructions. |
| 4697 | 4689 | const strat = rl.strategy(block_scope); |
| ... | ... | @@ -5021,8 +5013,6 @@ fn ifExpr( |
| 5021 | 5013 | &else_scope, |
| 5022 | 5014 | condbr, |
| 5023 | 5015 | cond.bool_bit, |
| 5024 | | if_full.ast.then_expr, |
| 5025 | | else_info.src, |
| 5026 | 5016 | then_result, |
| 5027 | 5017 | else_info.result, |
| 5028 | 5018 | block, |
| ... | ... | @@ -5303,8 +5293,6 @@ fn whileExpr( |
| 5303 | 5293 | &else_scope, |
| 5304 | 5294 | condbr, |
| 5305 | 5295 | cond.bool_bit, |
| 5306 | | while_full.ast.then_expr, |
| 5307 | | else_info.src, |
| 5308 | 5296 | then_result, |
| 5309 | 5297 | else_info.result, |
| 5310 | 5298 | loop_block, |
| ... | ... | @@ -5479,8 +5467,6 @@ fn forExpr( |
| 5479 | 5467 | &else_scope, |
| 5480 | 5468 | condbr, |
| 5481 | 5469 | cond, |
| 5482 | | for_full.ast.then_expr, |
| 5483 | | else_info.src, |
| 5484 | 5470 | then_result, |
| 5485 | 5471 | else_info.result, |
| 5486 | 5472 | loop_block, |
Andrew Kelley <andrew@ziglang.org> 2021-06-21 13:09:11-07:00
src