---

yaml
---
r: 11844
b: refs/heads/master
c: 1e0e089
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

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

trunk/src/rustc/middle/region.rs

@@ -254,12 +254,12 @@ fn resolve_expr(expr: @ast::expr, cx: ctxt, visitor: visit::vt<ctxt>) {
             }
             visit::visit_expr(expr, cx, visitor);
         }
-        ast::expr_addr_of(_, _) | ast::expr_alt(_, _, _) {
+        ast::expr_addr_of(_, subexpr) | ast::expr_alt(subexpr, _, _) {
             // Record the block that this expression appears in, in case the
             // operand is an rvalue.
             alt cx.parent {
                 pa_block(blk_id) {
-                    cx.region_map.rvalue_to_block.insert(expr.id, blk_id);
+                    cx.region_map.rvalue_to_block.insert(subexpr.id, blk_id);
                 }
                 _ { cx.sess.span_bug(expr.span, "expr outside of block?!"); }
             }

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

@@ -1649,11 +1649,12 @@ fn trans_unary(bcx: block, op: ast::unop, e: @ast::expr,
 }
 
 fn trans_addr_of(cx: block, e: @ast::expr, dest: dest) -> block {
-    // FIXME: This is wrong.
     let {bcx, val, kind} = trans_temp_lval(cx, e);
-    if kind != owned {
-        bcx.sess().span_bug(e.span,
-                            "can't take the address of an rvalue");
+    let ety = expr_ty(cx, e);
+    let is_immediate = ty::type_is_immediate(ety);
+    if (kind == temporary && is_immediate) || kind == owned_imm {
+        let {bcx: bcx2, val: val2} = do_spill(cx, val, ety);
+        bcx = bcx2; val = val2;
     }
     ret store_in_dest(bcx, val, dest);
 }

trunk/src/rustc/middle/typeck.rs

@@ -2492,7 +2492,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,
       ast::expr_alt(discrim, arms, _) {
         bot = check_expr(fcx, discrim);
 
-        let parent_block = tcx.region_map.rvalue_to_block.get(expr.id);
+        let parent_block = tcx.region_map.rvalue_to_block.get(discrim.id);
 
         // Typecheck the patterns first, so that we get types for all the
         // bindings.