Check for is_terminated after translating a block

marijnh · marijnh · commit bead045f2724 · 2011-08-24T10:55:34.000+02:00
Closes #861
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
@@ -4303,7 +4303,7 @@ fn trans_expr_out(cx: &@block_ctxt, e: &@ast::expr, output: out_method) ->
             with_out_method(bind trans_block(sub_cx, blk, _), cx, e.id,
                             output);
         cx.build.Br(sub_cx.llbb);
-        sub.bcx.build.Br(next_cx.llbb);
+        if !is_terminated(sub.bcx) { sub.bcx.build.Br(next_cx.llbb); }
         ret rslt(next_cx, sub.val);
       }
       ast::expr_copy(a) {

Original file line number	Diff line number	Diff line change
`@@ -4303,7 +4303,7 @@ fn trans_expr_out(cx: &@block_ctxt, e: &@ast::expr, output: out_method) ->`
`4303`	`4303`	`with_out_method(bind trans_block(sub_cx, blk, _), cx, e.id,`
`4304`	`4304`	`output);`
`4305`	`4305`	`cx.build.Br(sub_cx.llbb);`
`4306`		`- sub.bcx.build.Br(next_cx.llbb);`
	`4306`	`+ if !is_terminated(sub.bcx) { sub.bcx.build.Br(next_cx.llbb); }`
`4307`	`4307`	`ret rslt(next_cx, sub.val);`
`4308`	`4308`	`}`
`4309`	`4309`	`ast::expr_copy(a) {`