---

yaml
---
r: 90730
b: refs/heads/master
c: db83a95
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

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

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

@@ -93,7 +93,7 @@ pub struct CrateContext {
 
      module_data: RefCell<HashMap<~str, ValueRef>>,
      lltypes: RefCell<HashMap<ty::t, Type>>,
-     llsizingtypes: HashMap<ty::t, Type>,
+     llsizingtypes: RefCell<HashMap<ty::t, Type>>,
      adt_reprs: HashMap<ty::t, @adt::Repr>,
      symbol_hasher: Sha256,
      type_hashcodes: HashMap<ty::t, @str>,
@@ -204,7 +204,7 @@ impl CrateContext {
                   impl_method_cache: RefCell::new(HashMap::new()),
                   module_data: RefCell::new(HashMap::new()),
                   lltypes: RefCell::new(HashMap::new()),
-                  llsizingtypes: HashMap::new(),
+                  llsizingtypes: RefCell::new(HashMap::new()),
                   adt_reprs: HashMap::new(),
                   symbol_hasher: symbol_hasher,
                   type_hashcodes: HashMap::new(),

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

@@ -101,9 +101,12 @@ pub fn type_of_fn_from_ty(cx: &mut CrateContext, fty: ty::t) -> Type {
 //     recursive types. For example, enum types rely on this behavior.
 
 pub fn sizing_type_of(cx: &mut CrateContext, t: ty::t) -> Type {
-    match cx.llsizingtypes.find_copy(&t) {
-        Some(t) => return t,
-        None => ()
+    {
+        let llsizingtypes = cx.llsizingtypes.borrow();
+        match llsizingtypes.get().find_copy(&t) {
+            Some(t) => return t,
+            None => ()
+        }
     }
 
     let llsizingty = match ty::get(t).sty {
@@ -166,7 +169,8 @@ pub fn sizing_type_of(cx: &mut CrateContext, t: ty::t) -> Type {
         }
     };
 
-    cx.llsizingtypes.insert(t, llsizingty);
+    let mut llsizingtypes = cx.llsizingtypes.borrow_mut();
+    llsizingtypes.get().insert(t, llsizingty);
     llsizingty
 }