---

yaml
---
r: 90727
b: refs/heads/master
c: 1185fcc
h: refs/heads/master
i:
  90725: 55dcf30
  90723: 1605aac
  90719: 0f8181a
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 37e3f2fe63a9e0a41d5ebca7d276401599f3e636
+refs/heads/master: 1185fcc437e13cd1d492509361c29d05ee2548f6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/src/librustc/middle/trans/context.rs

@@ -89,7 +89,7 @@ pub struct CrateContext {
      // Cache of external const values
      extern_const_values: RefCell<HashMap<ast::DefId, ValueRef>>,
 
-     impl_method_cache: HashMap<(ast::DefId, ast::Name), ast::DefId>,
+     impl_method_cache: RefCell<HashMap<(ast::DefId, ast::Name), ast::DefId>>,
 
      module_data: HashMap<~str, ValueRef>,
      lltypes: HashMap<ty::t, Type>,
@@ -201,7 +201,7 @@ impl CrateContext {
                   const_globals: RefCell::new(HashMap::new()),
                   const_values: RefCell::new(HashMap::new()),
                   extern_const_values: RefCell::new(HashMap::new()),
-                  impl_method_cache: HashMap::new(),
+                  impl_method_cache: RefCell::new(HashMap::new()),
                   module_data: HashMap::new(),
                   lltypes: HashMap::new(),
                   llsizingtypes: HashMap::new(),

trunk/src/librustc/middle/trans/meth.rs

@@ -296,18 +296,22 @@ pub fn trans_static_method_callee(bcx: @Block,
 pub fn method_with_name(ccx: &mut CrateContext,
                         impl_id: ast::DefId,
                         name: ast::Name) -> ast::DefId {
-    let meth_id_opt = ccx.impl_method_cache.find_copy(&(impl_id, name));
-    match meth_id_opt {
-        Some(m) => return m,
-        None => {}
+    {
+        let impl_method_cache = ccx.impl_method_cache.borrow();
+        let meth_id_opt = impl_method_cache.get().find_copy(&(impl_id, name));
+        match meth_id_opt {
+            Some(m) => return m,
+            None => {}
+        }
     }
 
     let imp = ccx.tcx.impls.find(&impl_id)
         .expect("could not find impl while translating");
     let meth = imp.methods.iter().find(|m| m.ident.name == name)
         .expect("could not find method while translating");
 
-    ccx.impl_method_cache.insert((impl_id, name), meth.def_id);
+    let mut impl_method_cache = ccx.impl_method_cache.borrow_mut();
+    impl_method_cache.get().insert((impl_id, name), meth.def_id);
     meth.def_id
 }