---

yaml
---
r: 4903
b: refs/heads/master
c: a3c8d4a
h: refs/heads/master
i:
  4901: e5a8d50
  4899: ca415d2
  4895: 86c9fe5
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68fd28c2c139109bac3372c5fe6d05b228d6a579
+refs/heads/master: a3c8d4a5a58b42db6b8795980992e1063e84f59f

trunk/src/comp/middle/trans.rs

@@ -3188,11 +3188,11 @@ fn trans_for_each(cx: &@block_ctxt, local: &@ast::local, seq: &@ast::expr,
 
 fn trans_while(cx: &@block_ctxt, cond: &@ast::expr, body: &ast::blk) ->
    result {
-    let cond_cx = new_scope_block_ctxt(cx, "while cond");
-    let next_cx = new_sub_block_ctxt(cx, "next");
+    let next_cx = new_sub_block_ctxt(cx, "while next");
+    let cond_cx = new_loop_scope_block_ctxt(cx, option::none::<@block_ctxt>,
+                                            next_cx, "while cond");
     let body_cx =
-        new_loop_scope_block_ctxt(cx, option::none::<@block_ctxt>, next_cx,
-                                  "while loop body");
+        new_scope_block_ctxt(cond_cx, "while loop body");
     let body_res = trans_block(body_cx, body, return);
     let cond_res = trans_expr(cond_cx, cond);
     body_res.bcx.build.Br(cond_cx.llbb);

trunk/src/test/run-pass/while-cont.rs

@@ -0,0 +1,10 @@
+// Issue #825: Should recheck the loop contition after continuing
+fn main() {
+    let i = 1;
+    while i > 0 {
+        assert i > 0;
+        log i;
+        i -= 1;
+        cont;
+    }
+}