---

yaml
---
r: 90729
b: refs/heads/master
c: 0680520
h: refs/heads/master
i:
  90727: 17ff87b
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8c194a013651869ae44440e319b28dabfaa08f50
+refs/heads/master: 06805209e4f03f32ec0e06b156bb76fbf8f7a93e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

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

@@ -92,7 +92,7 @@ pub struct CrateContext {
      impl_method_cache: RefCell<HashMap<(ast::DefId, ast::Name), ast::DefId>>,
 
      module_data: RefCell<HashMap<~str, ValueRef>>,
-     lltypes: HashMap<ty::t, Type>,
+     lltypes: RefCell<HashMap<ty::t, Type>>,
      llsizingtypes: HashMap<ty::t, Type>,
      adt_reprs: HashMap<ty::t, @adt::Repr>,
      symbol_hasher: Sha256,
@@ -203,7 +203,7 @@ impl CrateContext {
                   extern_const_values: RefCell::new(HashMap::new()),
                   impl_method_cache: RefCell::new(HashMap::new()),
                   module_data: RefCell::new(HashMap::new()),
-                  lltypes: HashMap::new(),
+                  lltypes: RefCell::new(HashMap::new()),
                   llsizingtypes: HashMap::new(),
                   adt_reprs: HashMap::new(),
                   symbol_hasher: symbol_hasher,

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

@@ -173,11 +173,12 @@ pub fn sizing_type_of(cx: &mut CrateContext, t: ty::t) -> Type {
 // NB: If you update this, be sure to update `sizing_type_of()` as well.
 pub fn type_of(cx: &mut CrateContext, t: ty::t) -> Type {
     // Check the cache.
-    match cx.lltypes.find(&t) {
-        Some(&llty) => {
-            return llty;
+    {
+        let lltypes = cx.lltypes.borrow();
+        match lltypes.get().find(&t) {
+            Some(&llty) => return llty,
+            None => ()
         }
-        None => ()
     }
 
     debug!("type_of {} {:?}", t.repr(cx.tcx), t);
@@ -197,7 +198,8 @@ pub fn type_of(cx: &mut CrateContext, t: ty::t) -> Type {
                 t_norm.repr(cx.tcx),
                 t_norm,
                 cx.tn.type_to_str(llty));
-        cx.lltypes.insert(t, llty);
+        let mut lltypes = cx.lltypes.borrow_mut();
+        lltypes.get().insert(t, llty);
         return llty;
     }
 
@@ -316,7 +318,10 @@ pub fn type_of(cx: &mut CrateContext, t: ty::t) -> Type {
             t.repr(cx.tcx),
             t,
             cx.tn.type_to_str(llty));
-    cx.lltypes.insert(t, llty);
+    {
+        let mut lltypes = cx.lltypes.borrow_mut();
+        lltypes.get().insert(t, llty);
+    }
 
     // If this was an enum or struct, fill in the type now.
     match ty::get(t).sty {