---

yaml
---
r: 90732
b: refs/heads/master
c: 25337a7
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a1747a609122f6bc82f396897752d182fd583d4a
+refs/heads/master: 25337a7f9fd824ca26faee47a4bc4aaa6e542586
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/src/librustc/back/link.rs

@@ -521,14 +521,18 @@ pub fn symbol_hash(tcx: ty::ctxt,
 }
 
 pub fn get_symbol_hash(ccx: &mut CrateContext, t: ty::t) -> @str {
-    match ccx.type_hashcodes.find(&t) {
-      Some(&h) => h,
-      None => {
-        let hash = symbol_hash(ccx.tcx, &mut ccx.symbol_hasher, t, &ccx.link_meta);
-        ccx.type_hashcodes.insert(t, hash);
-        hash
-      }
+    {
+        let type_hashcodes = ccx.type_hashcodes.borrow();
+        match type_hashcodes.get().find(&t) {
+            Some(&h) => return h,
+            None => {}
+        }
     }
+
+    let mut type_hashcodes = ccx.type_hashcodes.borrow_mut();
+    let hash = symbol_hash(ccx.tcx, &mut ccx.symbol_hasher, t, &ccx.link_meta);
+    type_hashcodes.get().insert(t, hash);
+    hash
 }
 
 

trunk/src/librustc/middle/trans/context.rs

@@ -96,7 +96,7 @@ pub struct CrateContext {
      llsizingtypes: RefCell<HashMap<ty::t, Type>>,
      adt_reprs: RefCell<HashMap<ty::t, @adt::Repr>>,
      symbol_hasher: Sha256,
-     type_hashcodes: HashMap<ty::t, @str>,
+     type_hashcodes: RefCell<HashMap<ty::t, @str>>,
      type_short_names: HashMap<ty::t, ~str>,
      all_llvm_symbols: HashSet<@str>,
      tcx: ty::ctxt,
@@ -207,7 +207,7 @@ impl CrateContext {
                   llsizingtypes: RefCell::new(HashMap::new()),
                   adt_reprs: RefCell::new(HashMap::new()),
                   symbol_hasher: symbol_hasher,
-                  type_hashcodes: HashMap::new(),
+                  type_hashcodes: RefCell::new(HashMap::new()),
                   type_short_names: HashMap::new(),
                   all_llvm_symbols: HashSet::new(),
                   tcx: tcx,