---

yaml
---
r: 5367
b: refs/heads/master
c: 9626e2f
h: refs/heads/master
i:
  5365: 61899ee
  5363: b6670c4
  5359: 728ffa4
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a18986c1a1a0b0fe08ad30685c5f321d9352a06e
+refs/heads/master: 9626e2f71f86dd710c810b3c92cb8c84ecde6364

trunk/src/comp/middle/trans.rs

@@ -3939,7 +3939,6 @@ fn trans_tup(cx: @block_ctxt, elts: [@ast::expr], id: ast::node_id) ->
     let tup_res = alloc_ty(bcx, t);
     let tup_val = tup_res.val;
     bcx = tup_res.bcx;
-    add_clean_temp(cx, tup_val, t);
     let i: int = 0;
     for e in elts {
         let e_ty = ty::expr_ty(cx.fcx.lcx.ccx.tcx, e);
@@ -3951,6 +3950,9 @@ fn trans_tup(cx: @block_ctxt, elts: [@ast::expr], id: ast::node_id) ->
         bcx = move_val_if_temp(dst_res.bcx, INIT, dst_res.val, src, e_ty);
         i += 1;
     }
+
+    // Only register the cleanups after the tuple is built
+    add_clean_temp(cx, tup_val, t);
     ret rslt(bcx, tup_val);
 }
 

trunk/src/test/run-fail/unwind-tup.rs

@@ -0,0 +1,9 @@
+// error-pattern:fail
+
+fn fold_local() -> @[int]{
+    fail;
+}
+
+fn main() {
+    let lss = (fold_local(), 0);
+}