Un-XFAIL do-while-body-fails

Made it work both with optimization enabled, and with optimization
disabled. Huzzah!

diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index a0df89444cd95e020b7e2436dc27a97057701fa8..213a0e8704508e61254d63d3678e7c7daa283fb9 100644 (file)
--- a/src/comp/middle/trans.rs
+++ b/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);

diff --git a/src/test/run-fail/do-while-body-fails.rs b/src/test/run-fail/do-while-body-fails.rs
index daeba83db0ee3ada64d0567d71e51a79864d3bd3..1a6cac5fabc14571c5de31ae69131d1d66e7f97b 100644 (file)
--- a/src/test/run-fail/do-while-body-fails.rs
+++ b/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);