---

yaml
---
r: 2603
b: refs/heads/master
c: a98ea4f
h: refs/heads/master
i:
  2601: 48090a7
  2599: 3367505
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e840a37f33869ddee5785473617a2b5f834dca9f
+refs/heads/master: a98ea4f3ef60ddd83ff19d67fbc9db172893a521

trunk/src/comp/middle/trans.rs

@@ -3706,8 +3706,15 @@ fn trans_if(&@block_ctxt cx, &@ast::expr cond,
     alt (els) {
         case (some[@ast::expr](?elexpr)) {
             alt (elexpr.node) {
-                case (ast::expr_if(_, _, _, _)) {
-                    else_res = trans_expr(else_cx, elexpr);
+                case (ast::expr_if(?cond, ?thn, ?els, _)) {
+                    else_res = trans_if(else_cx, cond, thn, els);
+                    // The if expression may need to use the else context to
+                    // drop the refcount of its result so we need to run the
+                    // cleanups
+                    auto bcx = else_res.bcx;
+                    bcx = trans_block_cleanups(bcx,
+                                               find_scope_cx(bcx));
+                    else_res = res(bcx, else_res.val);
                 }
                 case (ast::expr_block(?blk, _)) {
                     // Calling trans_block directly instead of trans_expr

trunk/src/test/run-pass/expr-elseif-ref.rs

@@ -0,0 +1,17 @@
+// xfail-stage0
+
+// Make sure we drop the refs of the temporaries needed to return the
+// values from the else if branch
+
+fn main() {
+  let vec[uint] y = [10u];
+  auto x = if (false) {
+    y
+  } else if (true) {
+    y
+  } else {
+    y
+  };
+
+  assert y.(0) == 10u;
+}