---

yaml
---
r: 147613
b: refs/heads/try2
c: 4e9b8a7
h: refs/heads/master
i:
  147611: 1fb425c
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: f73dee17fc787cbcf022c74ec17d00329ddfe223
+refs/heads/try2: 4e9b8a742dbf7eac5627439b7b69f33322c5f3a1
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -110,7 +110,7 @@ use middle::typeck;
 use middle::moves;
 
 use std::cast::transmute;
-use std::cell::RefCell;
+use std::cell::{Cell, RefCell};
 use std::hashmap::HashMap;
 use std::io;
 use std::str;
@@ -245,7 +245,7 @@ struct IrMaps {
     method_map: typeck::method_map,
     capture_map: moves::CaptureMap,
 
-    num_live_nodes: uint,
+    num_live_nodes: Cell<uint>,
     num_vars: uint,
     live_node_map: HashMap<NodeId, LiveNode>,
     variable_map: HashMap<NodeId, Variable>,
@@ -262,7 +262,7 @@ fn IrMaps(tcx: ty::ctxt,
         tcx: tcx,
         method_map: method_map,
         capture_map: capture_map,
-        num_live_nodes: 0,
+        num_live_nodes: Cell::new(0),
         num_vars: 0,
         live_node_map: HashMap::new(),
         variable_map: HashMap::new(),
@@ -274,9 +274,10 @@ fn IrMaps(tcx: ty::ctxt,
 
 impl IrMaps {
     pub fn add_live_node(&mut self, lnk: LiveNodeKind) -> LiveNode {
-        let ln = LiveNode(self.num_live_nodes);
+        let num_live_nodes = self.num_live_nodes.get();
+        let ln = LiveNode(num_live_nodes);
         self.lnks.push(lnk);
-        self.num_live_nodes += 1;
+        self.num_live_nodes.set(num_live_nodes + 1);
 
         debug!("{} is of kind {}", ln.to_str(),
                live_node_kind_to_str(lnk, self.tcx));
@@ -601,8 +602,9 @@ fn Liveness(ir: @mut IrMaps, specials: Specials) -> Liveness {
         ir: ir,
         tcx: ir.tcx,
         s: specials,
-        successors: @mut vec::from_elem(ir.num_live_nodes, invalid_node()),
-        users: @mut vec::from_elem(ir.num_live_nodes * ir.num_vars,
+        successors: @mut vec::from_elem(ir.num_live_nodes.get(),
+                                        invalid_node()),
+        users: @mut vec::from_elem(ir.num_live_nodes.get() * ir.num_vars,
                                    invalid_users()),
         loop_scope: @mut ~[],
         break_ln: @RefCell::new(HashMap::new()),
@@ -883,7 +885,7 @@ impl Liveness {
         // hack to skip the loop unless debug! is enabled:
         debug!("^^ liveness computation results for body {} (entry={})",
                {
-                   for ln_idx in range(0u, self.ir.num_live_nodes) {
+                   for ln_idx in range(0u, self.ir.num_live_nodes.get()) {
                        debug!("{}", self.ln_str(LiveNode(ln_idx)));
                    }
                    body.id