librustc: De-@mut CrateContext::const_cstr_cache.

Author: pcwalton

src/librustc/middle/trans/common.rs

@@ -890,9 +890,12 @@ pub fn C_u8(i: uint) -> ValueRef {
 // our boxed-and-length-annotated strings.
 pub fn C_cstr(cx: &mut CrateContext, s: @str) -> ValueRef {
     unsafe {
-        match cx.const_cstr_cache.find_equiv(&s) {
-            Some(&llval) => return llval,
-            None => ()
+        {
+            let const_cstr_cache = cx.const_cstr_cache.borrow();
+            match const_cstr_cache.get().find_equiv(&s) {
+                Some(&llval) => return llval,
+                None => ()
+            }
         }
 
         let sc = llvm::LLVMConstStringInContext(cx.llcx,
@@ -907,9 +910,9 @@ pub fn C_cstr(cx: &mut CrateContext, s: @str) -> ValueRef {
         llvm::LLVMSetGlobalConstant(g, True);
         lib::llvm::SetLinkage(g, lib::llvm::InternalLinkage);
 
-        cx.const_cstr_cache.insert(s, g);
-
-        return g;
+        let mut const_cstr_cache = cx.const_cstr_cache.borrow_mut();
+        const_cstr_cache.get().insert(s, g);
+        g
     }
 }
 

src/librustc/middle/trans/context.rs

@@ -71,7 +71,7 @@ pub struct CrateContext {
      // Cache generated vtables
      vtables: RefCell<HashMap<(ty::t, mono_id), ValueRef>>,
      // Cache of constant strings,
-     const_cstr_cache: HashMap<@str, ValueRef>,
+     const_cstr_cache: RefCell<HashMap<@str, ValueRef>>,
 
      // Reverse-direction for const ptrs cast from globals.
      // Key is an int, cast from a ValueRef holding a *T,
@@ -197,7 +197,7 @@ impl CrateContext {
                   monomorphized: RefCell::new(HashMap::new()),
                   monomorphizing: RefCell::new(HashMap::new()),
                   vtables: RefCell::new(HashMap::new()),
-                  const_cstr_cache: HashMap::new(),
+                  const_cstr_cache: RefCell::new(HashMap::new()),
                   const_globals: HashMap::new(),
                   const_values: HashMap::new(),
                   extern_const_values: HashMap::new(),