---

yaml
---
r: 88894
b: refs/heads/snap-stage3
c: 0e2041c
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: 13f85cb097725a13ae24a6564c71597243b91c3d
+refs/heads/snap-stage3: 0e2041c54b3065cc285ae19744e8acbff7533890
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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
     }
 }
 

branches/snap-stage3/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(),