---

yaml
---
r: 11820
b: refs/heads/master
c: aeb445b
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b87cdd857228e576d0fcccba0d92b0b231375923
+refs/heads/master: aeb445b2ea25f9629df1d5d8fbd2906a92c8e719
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/trans/base.rs

@@ -2001,10 +2001,12 @@ fn trans_for(cx: block, local: @ast::local, seq: @ast::expr,
 fn trans_while(cx: block, cond: @ast::expr, body: ast::blk)
     -> block {
     let next_cx = sub_block(cx, "while next");
-    let cond_cx = loop_scope_block(cx, cont_self, next_cx,
-                                   "while cond", body.span);
-    let body_cx = scope_block(cond_cx, "while loop body");
-    Br(cx, cond_cx.llbb);
+    let loop_cx = loop_scope_block(cx, cont_self, next_cx,
+                                   "while loop", body.span);
+    let cond_cx = scope_block(loop_cx, "while loop cond");
+    let body_cx = scope_block(loop_cx, "while loop body");
+    Br(cx, loop_cx.llbb);
+    Br(loop_cx, cond_cx.llbb);
     let cond_res = trans_temp_expr(cond_cx, cond);
     let cond_bcx = trans_block_cleanups(cond_res.bcx, cond_cx);
     CondBr(cond_bcx, cond_res.val, body_cx.llbb, next_cx.llbb);

trunk/src/test/run-pass/issue-1974.rs

@@ -0,0 +1,8 @@
+// Issue 1974
+// Don't double free the condition allocation
+fn main() {
+    let s = "hej";
+    while s != "" {
+        ret;
+    }
+}