---

yaml
---
r: 88888
b: refs/heads/snap-stage3
c: d3f58c5
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

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

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

@@ -70,7 +70,7 @@ pub struct CrateContext {
      non_inlineable_statics: HashSet<ast::NodeId>,
      // Cache instances of monomorphized functions
      monomorphized: RefCell<HashMap<mono_id, ValueRef>>,
-     monomorphizing: HashMap<ast::DefId, uint>,
+     monomorphizing: RefCell<HashMap<ast::DefId, uint>>,
      // Cache generated vtables
      vtables: HashMap<(ty::t, mono_id), ValueRef>,
      // Cache of constant strings,
@@ -201,7 +201,7 @@ impl CrateContext {
                   external_srcs: HashMap::new(),
                   non_inlineable_statics: HashSet::new(),
                   monomorphized: RefCell::new(HashMap::new()),
-                  monomorphizing: HashMap::new(),
+                  monomorphizing: RefCell::new(HashMap::new()),
                   vtables: HashMap::new(),
                   const_cstr_cache: HashMap::new(),
                   const_globals: HashMap::new(),

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

@@ -184,17 +184,22 @@ pub fn monomorphic_fn(ccx: @mut CrateContext,
 
     ccx.stats.n_monos += 1;
 
-    let depth = match ccx.monomorphizing.find(&fn_id) {
-        Some(&d) => d, None => 0
-    };
-    // Random cut-off -- code that needs to instantiate the same function
-    // recursively more than thirty times can probably safely be assumed to be
-    // causing an infinite expansion.
-    if depth > 30 {
-        ccx.sess.span_fatal(
-            span, "overly deep expansion of inlined function");
+    let depth;
+    {
+        let mut monomorphizing = ccx.monomorphizing.borrow_mut();
+        depth = match monomorphizing.get().find(&fn_id) {
+            Some(&d) => d, None => 0
+        };
+
+        // Random cut-off -- code that needs to instantiate the same function
+        // recursively more than thirty times can probably safely be assumed
+        // to be causing an infinite expansion.
+        if depth > 30 {
+            ccx.sess.span_fatal(
+                span, "overly deep expansion of inlined function");
+        }
+        monomorphizing.get().insert(fn_id, depth + 1);
     }
-    ccx.monomorphizing.insert(fn_id, depth + 1);
 
     let (_, elt) = gensym_name(ccx.sess.str_of(name));
     let mut pt = (*pt).clone();
@@ -292,7 +297,11 @@ pub fn monomorphic_fn(ccx: @mut CrateContext,
         ccx.tcx.sess.bug(format!("Can't monomorphize a {:?}", map_node))
       }
     };
-    ccx.monomorphizing.insert(fn_id, depth);
+
+    {
+        let mut monomorphizing = ccx.monomorphizing.borrow_mut();
+        monomorphizing.get().insert(fn_id, depth);
+    }
 
     debug!("leaving monomorphic fn {}", ty::item_path_str(ccx.tcx, fn_id));
     (lldecl, must_cast)