---

yaml
---
r: 88884
b: refs/heads/snap-stage3
c: 2e46ac6
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: 2612d76d2276d15e30c022426d2ae5222a080b83
+refs/heads/snap-stage3: 2e46ac6449a48948cefeec2fa74032ff528f7871
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/metadata/tyencode.rs

@@ -60,17 +60,27 @@ fn mywrite(w: @mut MemWriter, fmt: &fmt::Arguments) {
 pub fn enc_ty(w: @mut MemWriter, cx: @ctxt, t: ty::t) {
     match cx.abbrevs {
       ac_no_abbrevs => {
-        let result_str = match cx.tcx.short_names_cache.find(&t) {
-            Some(&s) => s,
+          let result_str_opt;
+          {
+              let short_names_cache = cx.tcx.short_names_cache.borrow();
+              result_str_opt = short_names_cache.get()
+                                                .find(&t)
+                                                .map(|result| *result);
+          }
+          let result_str = match result_str_opt {
+            Some(s) => s,
             None => {
                 let wr = @mut MemWriter::new();
                 enc_sty(wr, cx, &ty::get(t).sty);
                 let s = str::from_utf8(*wr.inner_ref()).to_managed();
-                cx.tcx.short_names_cache.insert(t, s);
+                let mut short_names_cache = cx.tcx
+                                              .short_names_cache
+                                              .borrow_mut();
+                short_names_cache.get().insert(t, s);
                 s
-          }
-        };
-        w.write(result_str.as_bytes());
+            }
+          };
+          w.write(result_str.as_bytes());
       }
       ac_use_abbrevs(abbrevs) => {
           match abbrevs.find(&t) {

branches/snap-stage3/src/librustc/middle/ty.rs

@@ -307,7 +307,7 @@ struct ctxt_ {
     freevars: freevars::freevar_map,
     tcache: type_cache,
     rcache: creader_cache,
-    short_names_cache: @mut HashMap<t, @str>,
+    short_names_cache: RefCell<HashMap<t, @str>>,
     needs_unwind_cleanup_cache: @mut HashMap<t, bool>,
     tc_cache: @mut HashMap<uint, TypeContents>,
     ast_ty_to_ty_cache: @mut HashMap<NodeId, ast_ty_to_ty_cache_entry>,
@@ -993,7 +993,7 @@ pub fn mk_ctxt(s: session::Session,
         freevars: freevars,
         tcache: @mut HashMap::new(),
         rcache: mk_rcache(),
-        short_names_cache: new_ty_hash(),
+        short_names_cache: RefCell::new(HashMap::new()),
         needs_unwind_cleanup_cache: new_ty_hash(),
         tc_cache: @mut HashMap::new(),
         ast_ty_to_ty_cache: @mut HashMap::new(),