---

yaml
---
r: 96979
b: refs/heads/dist-snap
c: 25337a7
h: refs/heads/master
i:
  96977: c89a6d3
  96975: f39da74
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: a1747a609122f6bc82f396897752d182fd583d4a
+refs/heads/dist-snap: 25337a7f9fd824ca26faee47a4bc4aaa6e542586
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

branches/dist-snap/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,