---

yaml
---
r: 96994
b: refs/heads/dist-snap
c: 303a394
h: refs/heads/master
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: 07dc0f3a74f3bba5620c91a12320e5bf2773f7b8
+refs/heads/dist-snap: 303a39477b3645e96c8e78e7eb077e31dca3b0f9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/back/link.rs

@@ -530,7 +530,8 @@ pub fn get_symbol_hash(ccx: &mut CrateContext, t: ty::t) -> @str {
     }
 
     let mut type_hashcodes = ccx.type_hashcodes.borrow_mut();
-    let hash = symbol_hash(ccx.tcx, &mut ccx.symbol_hasher, t, &ccx.link_meta);
+    let mut symbol_hasher = ccx.symbol_hasher.borrow_mut();
+    let hash = symbol_hash(ccx.tcx, symbol_hasher.get(), t, &ccx.link_meta);
     type_hashcodes.get().insert(t, hash);
     hash
 }

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

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