---

yaml
---
r: 94666
b: refs/heads/try
c: bef2353
h: refs/heads/master
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: bd08889d689218d8c2e31aed6b064648e6e97f16
+refs/heads/try: bef2353e1bea928a7f99d09ed264da412686c5d1
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -250,7 +250,7 @@ struct IrMaps {
     live_node_map: RefCell<HashMap<NodeId, LiveNode>>,
     variable_map: RefCell<HashMap<NodeId, Variable>>,
     capture_info_map: RefCell<HashMap<NodeId, @~[CaptureInfo]>>,
-    var_kinds: ~[VarKind],
+    var_kinds: RefCell<~[VarKind]>,
     lnks: ~[LiveNodeKind],
 }
 
@@ -267,7 +267,7 @@ fn IrMaps(tcx: ty::ctxt,
         live_node_map: RefCell::new(HashMap::new()),
         variable_map: RefCell::new(HashMap::new()),
         capture_info_map: RefCell::new(HashMap::new()),
-        var_kinds: ~[],
+        var_kinds: RefCell::new(~[]),
         lnks: ~[],
     }
 }
@@ -297,7 +297,10 @@ impl IrMaps {
 
     pub fn add_variable(&mut self, vk: VarKind) -> Variable {
         let v = Variable(self.num_vars.get());
-        self.var_kinds.push(vk);
+        {
+            let mut var_kinds = self.var_kinds.borrow_mut();
+            var_kinds.get().push(vk);
+        }
         self.num_vars.set(self.num_vars.get() + 1);
 
         match vk {
@@ -325,7 +328,8 @@ impl IrMaps {
     }
 
     pub fn variable_name(&mut self, var: Variable) -> @str {
-        match self.var_kinds[*var] {
+        let var_kinds = self.var_kinds.borrow();
+        match var_kinds.get()[*var] {
             Local(LocalInfo { ident: nm, .. }) | Arg(_, nm) => {
                 self.tcx.sess.str_of(nm)
             },