---

yaml
---
r: 94667
b: refs/heads/try
c: 810177c
h: refs/heads/master
i:
  94665: f0cbeab
  94663: dc48d60
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: bef2353e1bea928a7f99d09ed264da412686c5d1
+refs/heads/try: 810177c78709e114f31ad16540f51b17fb6f3b98
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -251,7 +251,7 @@ struct IrMaps {
     variable_map: RefCell<HashMap<NodeId, Variable>>,
     capture_info_map: RefCell<HashMap<NodeId, @~[CaptureInfo]>>,
     var_kinds: RefCell<~[VarKind]>,
-    lnks: ~[LiveNodeKind],
+    lnks: RefCell<~[LiveNodeKind]>,
 }
 
 fn IrMaps(tcx: ty::ctxt,
@@ -268,15 +268,16 @@ fn IrMaps(tcx: ty::ctxt,
         variable_map: RefCell::new(HashMap::new()),
         capture_info_map: RefCell::new(HashMap::new()),
         var_kinds: RefCell::new(~[]),
-        lnks: ~[],
+        lnks: RefCell::new(~[]),
     }
 }
 
 impl IrMaps {
     pub fn add_live_node(&mut self, lnk: LiveNodeKind) -> LiveNode {
         let num_live_nodes = self.num_live_nodes.get();
         let ln = LiveNode(num_live_nodes);
-        self.lnks.push(lnk);
+        let mut lnks = self.lnks.borrow_mut();
+        lnks.get().push(lnk);
         self.num_live_nodes.set(num_live_nodes + 1);
 
         debug!("{} is of kind {}", ln.to_str(),
@@ -353,7 +354,8 @@ impl IrMaps {
     }
 
     pub fn lnk(&mut self, ln: LiveNode) -> LiveNodeKind {
-        self.lnks[*ln]
+        let lnks = self.lnks.borrow();
+        lnks.get()[*ln]
     }
 }
 
@@ -776,10 +778,16 @@ impl Liveness {
     pub fn ln_str(&self, ln: LiveNode) -> ~str {
         str::from_utf8_owned(io::mem::with_mem_writer(|wr| {
             let wr = wr as &mut io::Writer;
-            write!(wr, "[ln({}) of kind {:?} reads", *ln, self.ir.lnks[*ln]);
-            self.write_vars(wr, ln, |idx| self.users[idx].reader );
+            {
+                let lnks = self.ir.lnks.borrow();
+                write!(wr,
+                       "[ln({}) of kind {:?} reads",
+                       *ln,
+                       lnks.get()[*ln]);
+            }
+            self.write_vars(wr, ln, |idx| self.users[idx].reader);
             write!(wr, "  writes");
-            self.write_vars(wr, ln, |idx| self.users[idx].writer );
+            self.write_vars(wr, ln, |idx| self.users[idx].writer);
             write!(wr, "  precedes {}]", self.successors[*ln].to_str());
         }))
     }