---

yaml
---
r: 88880
b: refs/heads/snap-stage3
c: efdbd60
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: 02f13adaa34fea513ea6d3b48e8f47eff93e47a7
+refs/heads/snap-stage3: efdbd60a87d8a997df39907cf11ecfa5a8ba707e
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -295,7 +295,7 @@ struct ctxt_ {
     // A cache for the trait_methods() routine
     trait_methods_cache: RefCell<HashMap<DefId, @~[@Method]>>,
 
-    impl_trait_cache: @mut HashMap<ast::DefId, Option<@ty::TraitRef>>,
+    impl_trait_cache: RefCell<HashMap<ast::DefId, Option<@ty::TraitRef>>>,
 
     trait_refs: @mut HashMap<NodeId, @TraitRef>,
     trait_defs: @mut HashMap<DefId, @TraitDef>,
@@ -1001,7 +1001,7 @@ pub fn mk_ctxt(s: session::Session,
         methods: RefCell::new(HashMap::new()),
         trait_method_def_ids: RefCell::new(HashMap::new()),
         trait_methods_cache: RefCell::new(HashMap::new()),
-        impl_trait_cache: @mut HashMap::new(),
+        impl_trait_cache: RefCell::new(HashMap::new()),
         ty_param_defs: @mut HashMap::new(),
         adjustments: @mut HashMap::new(),
         normalized_cache: new_ty_hash(),
@@ -3621,10 +3621,14 @@ pub fn trait_method_def_ids(cx: ctxt, id: ast::DefId) -> @~[DefId] {
 }
 
 pub fn impl_trait_ref(cx: ctxt, id: ast::DefId) -> Option<@TraitRef> {
-    match cx.impl_trait_cache.find(&id) {
-        Some(&ret) => { return ret; }
-        None => {}
+    {
+        let mut impl_trait_cache = cx.impl_trait_cache.borrow_mut();
+        match impl_trait_cache.get().find(&id) {
+            Some(&ret) => { return ret; }
+            None => {}
+        }
     }
+
     let ret = if id.crate == ast::LOCAL_CRATE {
         debug!("(impl_trait_ref) searching for trait impl {:?}", id);
         match cx.items.find(&id.node) {
@@ -3642,7 +3646,9 @@ pub fn impl_trait_ref(cx: ctxt, id: ast::DefId) -> Option<@TraitRef> {
     } else {
         csearch::get_impl_trait(cx, id)
     };
-    cx.impl_trait_cache.insert(id, ret);
+
+    let mut impl_trait_cache = cx.impl_trait_cache.borrow_mut();
+    impl_trait_cache.get().insert(id, ret);
     return ret;
 }