---

yaml
---
r: 96978
b: refs/heads/dist-snap
c: a1747a6
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: db83a957b60d7b6e7045909b8ce3c1ddf78e8fde
+refs/heads/dist-snap: a1747a609122f6bc82f396897752d182fd583d4a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/trans/adt.rs

@@ -118,13 +118,18 @@ pub fn represent_node(bcx: @Block, node: ast::NodeId) -> @Repr {
 /// Decides how to represent a given type.
 pub fn represent_type(cx: &mut CrateContext, t: ty::t) -> @Repr {
     debug!("Representing: {}", ty_to_str(cx.tcx, t));
-    match cx.adt_reprs.find(&t) {
-        Some(repr) => return *repr,
-        None => { }
+    {
+        let adt_reprs = cx.adt_reprs.borrow();
+        match adt_reprs.get().find(&t) {
+            Some(repr) => return *repr,
+            None => {}
+        }
     }
+
     let repr = @represent_type_uncached(cx, t);
     debug!("Represented as: {:?}", repr)
-    cx.adt_reprs.insert(t, repr);
+    let mut adt_reprs = cx.adt_reprs.borrow_mut();
+    adt_reprs.get().insert(t, repr);
     return repr;
 }
 

branches/dist-snap/src/librustc/middle/trans/context.rs

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