---

yaml
---
r: 147615
b: refs/heads/try2
c: e5c399a
h: refs/heads/master
i:
  147613: ef22087
  147611: 1fb425c
  147607: a22a1e5
  147599: 80f7b4b
  147583: a99a75c
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 01ee2fb2246cf72f3dc748fa2aa143c8b70974cc
+refs/heads/try2: e5c399a83cc0b85b5d79bb6d5377f18d348cc597
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/liveness.rs

@@ -247,7 +247,7 @@ struct IrMaps {
 
     num_live_nodes: Cell<uint>,
     num_vars: Cell<uint>,
-    live_node_map: HashMap<NodeId, LiveNode>,
+    live_node_map: RefCell<HashMap<NodeId, LiveNode>>,
     variable_map: HashMap<NodeId, Variable>,
     capture_info_map: HashMap<NodeId, @~[CaptureInfo]>,
     var_kinds: ~[VarKind],
@@ -264,7 +264,7 @@ fn IrMaps(tcx: ty::ctxt,
         capture_map: capture_map,
         num_live_nodes: Cell::new(0),
         num_vars: Cell::new(0),
-        live_node_map: HashMap::new(),
+        live_node_map: RefCell::new(HashMap::new()),
         variable_map: HashMap::new(),
         capture_info_map: HashMap::new(),
         var_kinds: ~[],
@@ -289,7 +289,8 @@ impl IrMaps {
                                   node_id: NodeId,
                                   lnk: LiveNodeKind) {
         let ln = self.add_live_node(lnk);
-        self.live_node_map.insert(node_id, ln);
+        let mut live_node_map = self.live_node_map.borrow_mut();
+        live_node_map.get().insert(node_id, ln);
 
         debug!("{} is node {}", ln.to_str(), node_id);
     }
@@ -616,7 +617,8 @@ fn Liveness(ir: @mut IrMaps, specials: Specials) -> Liveness {
 impl Liveness {
     pub fn live_node(&self, node_id: NodeId, span: Span) -> LiveNode {
         let ir: &mut IrMaps = self.ir;
-        match ir.live_node_map.find(&node_id) {
+        let live_node_map = ir.live_node_map.borrow();
+        match live_node_map.get().find(&node_id) {
           Some(&ln) => ln,
           None => {
             // This must be a mismatch between the ir_map construction