---

yaml
---
r: 90722
b: refs/heads/master
c: 13f85cb
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5dcc5165a6cabbe5dc28c6564464e655b6b43638
+refs/heads/master: 13f85cb097725a13ae24a6564c71597243b91c3d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

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

@@ -69,7 +69,7 @@ pub struct CrateContext {
      monomorphized: RefCell<HashMap<mono_id, ValueRef>>,
      monomorphizing: RefCell<HashMap<ast::DefId, uint>>,
      // Cache generated vtables
-     vtables: HashMap<(ty::t, mono_id), ValueRef>,
+     vtables: RefCell<HashMap<(ty::t, mono_id), ValueRef>>,
      // Cache of constant strings,
      const_cstr_cache: HashMap<@str, ValueRef>,
 
@@ -196,7 +196,7 @@ impl CrateContext {
                   non_inlineable_statics: HashSet::new(),
                   monomorphized: RefCell::new(HashMap::new()),
                   monomorphizing: RefCell::new(HashMap::new()),
-                  vtables: HashMap::new(),
+                  vtables: RefCell::new(HashMap::new()),
                   const_cstr_cache: HashMap::new(),
                   const_globals: HashMap::new(),
                   const_values: HashMap::new(),

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

@@ -539,9 +539,12 @@ pub fn get_vtable(bcx: @Block,
 
     // Check the cache.
     let hash_id = (self_ty, vtable_id(ccx, &origins[0]));
-    match ccx.vtables.find(&hash_id) {
-        Some(&val) => { return val }
-        None => { }
+    {
+        let vtables = ccx.vtables.borrow();
+        match vtables.get().find(&hash_id) {
+            Some(&val) => { return val }
+            None => { }
+        }
     }
 
     // Not in the cache. Actually build it.
@@ -559,7 +562,9 @@ pub fn get_vtable(bcx: @Block,
     glue::lazily_emit_all_tydesc_glue(ccx, tydesc);
 
     let vtable = make_vtable(ccx, tydesc, methods);
-    ccx.vtables.insert(hash_id, vtable);
+
+    let mut vtables = ccx.vtables.borrow_mut();
+    vtables.get().insert(hash_id, vtable);
     return vtable;
 }