---

yaml
---
r: 14326
b: refs/heads/try
c: e62ddf4
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: ea6bb5aafa1827718b143a3657a212cf28e2e08e
+refs/heads/try: e62ddf48988087d19934e1fdc6abb6de5f7a6a02
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/middle/trans/alt.rs

@@ -691,14 +691,16 @@ fn trans_alt(cx: @block_ctxt, expr: @ast::expr, arms_: [ast::arm],
                                                   a.pats[0])) {
             let arm_dest = base::dup_for_join(dest);
             arm_dests += [arm_dest];
-            arm_cxs += [base::trans_block_dps(body_cx, a.body, arm_dest)];
+            let arm_cx = base::trans_block(body_cx, a.body, arm_dest);
+            arm_cx = base::trans_block_cleanups(arm_cx, body_cx);
+            arm_cxs += [arm_cx];
         }
         i += 1u;
     }
-    let after_cx = base::join_returns(cx, arm_cxs, arm_dests, dest);
-    after_cx = base::trans_block_cleanups(after_cx, alt_cx);
-    let next_cx = new_sub_block_ctxt(after_cx, "next");
-    Br(after_cx, next_cx.llbb);
+    let after_cx = base::join_returns(alt_cx, arm_cxs, arm_dests, dest);
+    let next_cx = new_sub_block_ctxt(cx, "next");
+    if after_cx.unreachable { Unreachable(next_cx); }
+    base::cleanup_and_Br(after_cx, alt_cx, next_cx.llbb);
     ret next_cx;
 }