---

yaml
---
r: 147696
b: refs/heads/try2
c: 1a6c1e5
h: refs/heads/master
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: 89dfd00dcf8016447143e985dbbd812dba4c1b3a
+refs/heads/try2: 1a6c1e5d3238cd9817e72006735b59a578e0ac13
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -590,7 +590,7 @@ pub struct Liveness {
     tcx: ty::ctxt,
     ir: @IrMaps,
     s: Specials,
-    successors: @mut ~[LiveNode],
+    successors: @RefCell<~[LiveNode]>,
     users: @mut ~[Users],
     // The list of node IDs for the nested loop scopes
     // we're in.
@@ -607,8 +607,8 @@ fn Liveness(ir: @IrMaps, specials: Specials) -> Liveness {
         ir: ir,
         tcx: ir.tcx,
         s: specials,
-        successors: @mut vec::from_elem(ir.num_live_nodes.get(),
-                                        invalid_node()),
+        successors: @RefCell::new(vec::from_elem(ir.num_live_nodes.get(),
+                                                 invalid_node())),
         users: @mut vec::from_elem(ir.num_live_nodes.get() *
                                    ir.num_vars.get(),
                                    invalid_users()),
@@ -694,7 +694,11 @@ impl Liveness {
     */
     pub fn live_on_exit(&self, ln: LiveNode, var: Variable)
                         -> Option<LiveNodeKind> {
-        self.live_on_entry(self.successors[*ln], var)
+        let successor = {
+            let successors = self.successors.borrow();
+            successors.get()[*ln]
+        };
+        self.live_on_entry(successor, var)
     }
 
     pub fn used_on_entry(&self, ln: LiveNode, var: Variable) -> bool {
@@ -711,7 +715,11 @@ impl Liveness {
 
     pub fn assigned_on_exit(&self, ln: LiveNode, var: Variable)
                             -> Option<LiveNodeKind> {
-        self.assigned_on_entry(self.successors[*ln], var)
+        let successor = {
+            let successors = self.successors.borrow();
+            successors.get()[*ln]
+        };
+        self.assigned_on_entry(successor, var)
     }
 
     pub fn indices2(&self,
@@ -782,12 +790,19 @@ impl Liveness {
             self.write_vars(wr, ln, |idx| self.users[idx].reader);
             write!(wr, "  writes");
             self.write_vars(wr, ln, |idx| self.users[idx].writer);
-            write!(wr, "  precedes {}]", self.successors[*ln].to_str());
+            let successor = {
+                let successors = self.successors.borrow();
+                successors.get()[*ln]
+            };
+            write!(wr, "  precedes {}]", successor.to_str());
         }))
     }
 
     pub fn init_empty(&self, ln: LiveNode, succ_ln: LiveNode) {
-        self.successors[*ln] = succ_ln;
+        {
+            let mut successors = self.successors.borrow_mut();
+            successors.get()[*ln] = succ_ln;
+        }
 
         // It is not necessary to initialize the
         // values to empty because this is the value
@@ -801,7 +816,11 @@ impl Liveness {
 
     pub fn init_from_succ(&self, ln: LiveNode, succ_ln: LiveNode) {
         // more efficient version of init_empty() / merge_from_succ()
-        self.successors[*ln] = succ_ln;
+        {
+            let mut successors = self.successors.borrow_mut();
+            successors.get()[*ln] = succ_ln;
+        }
+
         self.indices2(ln, succ_ln, |idx, succ_idx| {
             self.users[idx] = self.users[succ_idx]
         });