---

yaml
---
r: 14830
b: refs/heads/try
c: c3516f0
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

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

branches/try/src/rustc/middle/region.rs

@@ -40,7 +40,12 @@ type region_map = {
     /* Mapping from an AST type node to the region that `&` resolves to. */
     ast_type_to_inferred_region: hashmap<ast::node_id,ty::region>,
     /* Mapping from a call site (or `bind` site) to its containing block. */
-    call_site_to_block: hashmap<ast::node_id,ast::node_id>
+    call_site_to_block: hashmap<ast::node_id,ast::node_id>,
+    /*
+     * Mapping from an address-of operator or alt expression to its containing
+     * block. This is used as the region if the operand is an rvalue.
+     */
+    rvalue_to_block: hashmap<ast::node_id,ast::node_id>
 };
 
 type ctxt = {
@@ -249,6 +254,17 @@ 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(_, _, _) {
+            // 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.sess.span_bug(expr.span, "expr outside of block?!"); }
+            }
+            visit::visit_expr(expr, cx, visitor);
+        }
         _ { visit::visit_expr(expr, cx, visitor); }
     }
 }
@@ -276,7 +292,8 @@ fn resolve_crate(sess: session, def_map: resolve::def_map, crate: @ast::crate)
                                   region_name_to_fn: new_def_hash(),
                                   ast_type_to_inferred_region:
                                     map::new_int_hash(),
-                                  call_site_to_block: map::new_int_hash()},
+                                  call_site_to_block: map::new_int_hash(),
+                                  rvalue_to_block: map::new_int_hash()},
                     mut bindings: @list::nil,
                     mut queued_locals: [],
                     parent: pa_crate,

branches/try/src/rustc/middle/typeck.rs

@@ -1931,8 +1931,8 @@ fn region_of(fcx: @fn_ctxt, expr: @ast::expr) -> ty::region {
                                          "index, or deref operations");
         }
         _ {
-            fcx.ccx.tcx.sess.span_err(expr.span, "not an lvalue");
-            ret ty::re_block(0);
+            let blk_id = fcx.ccx.tcx.region_map.rvalue_to_block.get(expr.id);
+            ret ty::re_block(blk_id);
         }
     }
 }