---

yaml
---
r: 4647
b: refs/heads/master
c: c01e487
h: refs/heads/master
i:
  4645: cad56a7
  4643: 47f5cad
  4639: 42de812
v: v3

Author: catamorphism

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60e1cead9bab129b1937a11c71ab2ab2fd751792
+refs/heads/master: c01e48748504934e27ac89b2ca12d7d626e3be42

trunk/src/comp/middle/trans.rs

@@ -3805,7 +3805,14 @@ fn trans_do_while(cx: &@block_ctxt, body: &ast::blk, cond: &@ast::expr) ->
     if is_terminated(body_res.bcx) {
         // This is kind of ridiculous, but no permutations
         // involving body_res or body_cx.val worked.
-        ret trans_block(cx, body, return);
+        let rs = trans_block(cx, body, return);
+        if ! is_terminated (next_cx) {
+            next_cx.build.Unreachable();
+        }
+        if ! is_terminated (body_cx) {
+            body_cx.build.Unreachable();
+        }
+        ret rs;
     }
     let cond_res = trans_expr(body_res.bcx, cond);
     cond_res.bcx.build.CondBr(cond_res.val, body_cx.llbb, next_cx.llbb);

trunk/src/test/run-fail/do-while-body-fails.rs

@@ -1,6 +1,3 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
 // error-pattern:quux
 fn main() {
     let x: int = do { fail "quux" } while (true);