---

yaml
---
r: 88886
b: refs/heads/snap-stage3
c: 6a0450c
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: ba2e6c1e9516ecf01378e4e54fd857e069535826
+refs/heads/snap-stage3: 6a0450c67d81c6969fa43c01d37a2f196b7d58ce
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -309,7 +309,7 @@ struct ctxt_ {
     rcache: creader_cache,
     short_names_cache: RefCell<HashMap<t, @str>>,
     needs_unwind_cleanup_cache: RefCell<HashMap<t, bool>>,
-    tc_cache: @mut HashMap<uint, TypeContents>,
+    tc_cache: RefCell<HashMap<uint, TypeContents>>,
     ast_ty_to_ty_cache: @mut HashMap<NodeId, ast_ty_to_ty_cache_entry>,
     enum_var_cache: @mut HashMap<DefId, @~[@VariantInfo]>,
     ty_param_defs: @mut HashMap<ast::NodeId, TypeParameterDef>,
@@ -995,7 +995,7 @@ pub fn mk_ctxt(s: session::Session,
         rcache: mk_rcache(),
         short_names_cache: RefCell::new(HashMap::new()),
         needs_unwind_cleanup_cache: RefCell::new(HashMap::new()),
-        tc_cache: @mut HashMap::new(),
+        tc_cache: RefCell::new(HashMap::new()),
         ast_ty_to_ty_cache: @mut HashMap::new(),
         enum_var_cache: @mut HashMap::new(),
         methods: RefCell::new(HashMap::new()),
@@ -1970,14 +1970,20 @@ pub fn type_is_freezable(cx: ctxt, t: ty::t) -> bool {
 
 pub fn type_contents(cx: ctxt, ty: t) -> TypeContents {
     let ty_id = type_id(ty);
-    match cx.tc_cache.find(&ty_id) {
-        Some(tc) => { return *tc; }
-        None => {}
+
+    {
+        let tc_cache = cx.tc_cache.borrow();
+        match tc_cache.get().find(&ty_id) {
+            Some(tc) => { return *tc; }
+            None => {}
+        }
     }
 
     let mut cache = HashMap::new();
     let result = tc_ty(cx, ty, &mut cache);
-    cx.tc_cache.insert(ty_id, result);
+
+    let mut tc_cache = cx.tc_cache.borrow_mut();
+    tc_cache.get().insert(ty_id, result);
     return result;
 
     fn tc_ty(cx: ctxt,
@@ -2010,9 +2016,12 @@ pub fn type_contents(cx: ctxt, ty: t) -> TypeContents {
             Some(tc) => { return *tc; }
             None => {}
         }
-        match cx.tc_cache.find(&ty_id) {    // Must check both caches!
-            Some(tc) => { return *tc; }
-            None => {}
+        {
+            let tc_cache = cx.tc_cache.borrow();
+            match tc_cache.get().find(&ty_id) {    // Must check both caches!
+                Some(tc) => { return *tc; }
+                None => {}
+            }
         }
         cache.insert(ty_id, TC::None);