---

yaml
---
r: 147691
b: refs/heads/try2
c: e84f79f
h: refs/heads/master
i:
  147689: 7cee5cf
  147687: fdcf2e9
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: 8c3a552ac54d96394c395d6edd2e9cded8e52b0c
+refs/heads/try2: e84f79feb17d0b17f5898b5df934c3a5588eb4cf
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/base.rs

@@ -3268,7 +3268,8 @@ pub fn trans_crate(sess: session::Session,
         }
     }
     if ccx.sess.count_llvm_insns() {
-        for (k, v) in ccx.stats.llvm_insns.iter() {
+        let llvm_insns = ccx.stats.llvm_insns.borrow();
+        for (k, v) in llvm_insns.get().iter() {
             println!("{:7u} {}", *v, *k);
         }
     }

branches/try2/src/librustc/middle/trans/builder.rs

@@ -54,7 +54,7 @@ impl Builder {
         }
         if self.ccx.sess.count_llvm_insns() {
             base::with_insn_ctxt(|v| {
-                let h = &mut self.ccx.stats.llvm_insns;
+                let mut h = self.ccx.stats.llvm_insns.borrow_mut();
 
                 // Build version of path with cycles removed.
 
@@ -82,11 +82,11 @@ impl Builder {
                 s.push_char('/');
                 s.push_str(category);
 
-                let n = match h.find(&s) {
+                let n = match h.get().find(&s) {
                     Some(&n) => n,
                     _ => 0u
                 };
-                h.insert(s, n+1u);
+                h.get().insert(s, n+1u);
             })
         }
     }

branches/try2/src/librustc/middle/trans/common.rs

@@ -135,7 +135,7 @@ pub struct Stats {
     n_inlines: Cell<uint>,
     n_closures: Cell<uint>,
     n_llvm_insns: Cell<uint>,
-    llvm_insns: HashMap<~str, uint>,
+    llvm_insns: RefCell<HashMap<~str, uint>>,
     fn_stats: ~[(~str, uint, uint)] // (ident, time-in-ms, llvm-instructions)
 }
 

branches/try2/src/librustc/middle/trans/context.rs

@@ -220,7 +220,7 @@ impl CrateContext {
                     n_inlines: Cell::new(0u),
                     n_closures: Cell::new(0u),
                     n_llvm_insns: Cell::new(0u),
-                    llvm_insns: HashMap::new(),
+                    llvm_insns: RefCell::new(HashMap::new()),
                     fn_stats: ~[]
                   },
                   tydesc_type: tydesc_type,