---

yaml
---
r: 88887
b: refs/heads/snap-stage3
c: b5218ba
h: refs/heads/master
i:
  88885: 9240a77
  88883: ac7e598
  88879: d309cc8
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: deeca5d586bfaa4aa60246f671a8d611d38f6248
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 6a0450c67d81c6969fa43c01d37a2f196b7d58ce
+refs/heads/snap-stage3: b5218ba6ad05f0c5a31575b2fe59949b3dc25129
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/context.rs

@@ -27,6 +27,7 @@ use middle::trans::type_::Type;
 
 use util::sha2::Sha256;
 
+use std::cell::RefCell;
 use std::c_str::ToCStr;
 use std::hashmap::{HashMap, HashSet};
 use std::local_data;
@@ -68,7 +69,7 @@ pub struct CrateContext {
      // that is generated
      non_inlineable_statics: HashSet<ast::NodeId>,
      // Cache instances of monomorphized functions
-     monomorphized: HashMap<mono_id, ValueRef>,
+     monomorphized: RefCell<HashMap<mono_id, ValueRef>>,
      monomorphizing: HashMap<ast::DefId, uint>,
      // Cache generated vtables
      vtables: HashMap<(ty::t, mono_id), ValueRef>,
@@ -199,7 +200,7 @@ impl CrateContext {
                   external: HashMap::new(),
                   external_srcs: HashMap::new(),
                   non_inlineable_statics: HashSet::new(),
-                  monomorphized: HashMap::new(),
+                  monomorphized: RefCell::new(HashMap::new()),
                   monomorphizing: HashMap::new(),
                   vtables: HashMap::new(),
                   const_cstr_cache: HashMap::new(),

branches/snap-stage3/src/librustc/middle/trans/monomorphize.rs

@@ -76,13 +76,16 @@ pub fn monomorphic_fn(ccx: @mut CrateContext,
            psubsts.repr(ccx.tcx),
            hash_id);
 
-    match ccx.monomorphized.find(&hash_id) {
-      Some(&val) => {
-        debug!("leaving monomorphic fn {}",
-               ty::item_path_str(ccx.tcx, fn_id));
-        return (val, must_cast);
-      }
-      None => ()
+    {
+        let monomorphized = ccx.monomorphized.borrow();
+        match monomorphized.get().find(&hash_id) {
+          Some(&val) => {
+            debug!("leaving monomorphic fn {}",
+                   ty::item_path_str(ccx.tcx, fn_id));
+            return (val, must_cast);
+          }
+          None => ()
+        }
     }
 
     let tpt = ty::lookup_item_type(ccx.tcx, fn_id);
@@ -201,7 +204,8 @@ pub fn monomorphic_fn(ccx: @mut CrateContext,
 
     let mk_lldecl = || {
         let lldecl = decl_internal_rust_fn(ccx, f.sig.inputs, f.sig.output, s);
-        ccx.monomorphized.insert(hash_id, lldecl);
+        let mut monomorphized = ccx.monomorphized.borrow_mut();
+        monomorphized.get().insert(hash_id, lldecl);
         lldecl
     };