---

yaml
---
r: 11835
b: refs/heads/master
c: 3a45f87
h: refs/heads/master
i:
  11833: a46f1fa
  11831: a22cb12
v: v3

Author: pcwalton

[refs]

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

trunk/src/rustc/middle/region.rs

@@ -269,6 +269,16 @@ fn resolve_expr(expr: @ast::expr, cx: ctxt, visitor: visit::vt<ctxt>) {
     }
 }
 
+fn resolve_local(local: @ast::local, cx: ctxt, visitor: visit::vt<ctxt>) {
+    alt cx.parent {
+        pa_block(blk_id) {
+            cx.region_map.rvalue_to_block.insert(local.node.id, blk_id);
+        }
+        _ { cx.sess.span_bug(local.span, "local outside of block?!"); }
+    }
+    visit::visit_local(local, cx, visitor);
+}
+
 fn resolve_item(item: @ast::item, cx: ctxt, visitor: visit::vt<ctxt>) {
     // Items create a new outer block scope as far as we're concerned.
     let parent = alt item.node {
@@ -304,7 +314,8 @@ fn resolve_crate(sess: session, def_map: resolve::def_map, crate: @ast::crate)
         visit_ty: resolve_ty,
         visit_arm: resolve_arm,
         visit_pat: resolve_pat,
-        visit_expr: resolve_expr
+        visit_expr: resolve_expr,
+        visit_local: resolve_local
         with *visit::default_visitor()
     });
     visit::visit_crate(*crate, cx, visitor);