---

yaml
---
r: 1591
b: refs/heads/master
c: 7505c1f
h: refs/heads/master
i:
  1589: c5417be
  1587: 43b38ef
  1583: 7e109d3
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d3cec71a3282a090903a919d418c638a3b1ebe6
+refs/heads/master: 7505c1fa2319adbd928847ca27f75f5a95eb7c3d

trunk/src/Makefile

@@ -513,7 +513,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         vec-alloc-append.rs \
                         vec-append.rs \
                         vec-slice.rs \
-                        while-prelude-drop.rs \
                         while-with-break.rs \
                         yield.rs \
                         yield2.rs \

trunk/src/comp/middle/trans.rs

@@ -3005,9 +3005,9 @@ fn trans_while(@block_ctxt cx, @ast.expr cond,
     auto cond_res = trans_expr(cond_cx, cond);
 
     body_res.bcx.build.Br(cond_cx.llbb);
-    cond_res.bcx.build.CondBr(cond_res.val,
-                              body_cx.llbb,
-                              next_cx.llbb);
+
+    auto cond_bcx = trans_block_cleanups(cond_res.bcx, cond_cx);
+    cond_bcx.build.CondBr(cond_res.val, body_cx.llbb, next_cx.llbb);
 
     cx.build.Br(cond_cx.llbb);
     ret res(next_cx, C_nil());