---

yaml
---
r: 4573
b: refs/heads/master
c: 051b401
h: refs/heads/master
i:
  4571: 889c177
v: v3

Author: catamorphism

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19bbd0204970f7a41bafa40016ac52366666d02e
+refs/heads/master: 051b401051727d8d4e2ee27f9242b24158831f81

trunk/src/comp/middle/trans.rs

@@ -3802,6 +3802,11 @@ fn trans_do_while(cx: &@block_ctxt, body: &ast::blk, cond: &@ast::expr) ->
         new_loop_scope_block_ctxt(cx, option::none[@block_ctxt], next_cx,
                                   "do-while loop body");
     let body_res = trans_block(body_cx, body, return);
+    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 cond_res = trans_expr(body_res.bcx, cond);
     cond_res.bcx.build.CondBr(cond_res.val, body_cx.llbb, next_cx.llbb);
     cx.build.Br(body_cx.llbb);

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

@@ -0,0 +1,4 @@
+// error-pattern:quux
+fn main() {
+    let x: int = do { fail "quux" } while (true);
+}