---

yaml
---
r: 96983
b: refs/heads/dist-snap
c: 519db34
h: refs/heads/master
i:
  96981: f57ad4d
  96979: 6a6b305
  96975: f39da74
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: b5aa6eb69fce2a1cda2e12b770d5242ea14a3a3d
+refs/heads/dist-snap: 519db347229376dd4f7e08df38dd85ae3a43c9ed
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -439,16 +439,19 @@ pub fn get_tydesc_simple(ccx: &mut CrateContext, t: ty::t) -> ValueRef {
 }
 
 pub fn get_tydesc(ccx: &mut CrateContext, t: ty::t) -> @mut tydesc_info {
-    match ccx.tydescs.find(&t) {
-        Some(&inf) => {
-            return inf;
+    {
+        let tydescs = ccx.tydescs.borrow();
+        match tydescs.get().find(&t) {
+            Some(&inf) => return inf,
+            _ => { }
         }
-        _ => { }
     }
 
     ccx.stats.n_static_tydescs += 1u;
     let inf = glue::declare_tydesc(ccx, t);
-    ccx.tydescs.insert(t, inf);
+
+    let mut tydescs = ccx.tydescs.borrow_mut();
+    tydescs.get().insert(t, inf);
     return inf;
 }
 

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

@@ -52,7 +52,7 @@ pub struct CrateContext {
      reachable: @mut HashSet<ast::NodeId>,
      item_symbols: RefCell<HashMap<ast::NodeId, ~str>>,
      link_meta: LinkMeta,
-     tydescs: HashMap<ty::t, @mut tydesc_info>,
+     tydescs: RefCell<HashMap<ty::t, @mut tydesc_info>>,
      // Set when running emit_tydescs to enforce that no more tydescs are
      // created.
      finished_tydescs: bool,
@@ -188,7 +188,7 @@ impl CrateContext {
                   reachable: reachable,
                   item_symbols: RefCell::new(HashMap::new()),
                   link_meta: link_meta,
-                  tydescs: HashMap::new(),
+                  tydescs: RefCell::new(HashMap::new()),
                   finished_tydescs: false,
                   external: HashMap::new(),
                   external_srcs: HashMap::new(),

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

@@ -696,8 +696,8 @@ pub fn emit_tydescs(ccx: &mut CrateContext) {
     // As of this point, allow no more tydescs to be created.
     ccx.finished_tydescs = true;
     let glue_fn_ty = Type::generic_glue_fn(ccx).ptr_to();
-    let tyds = &mut ccx.tydescs;
-    for (_, &val) in tyds.iter() {
+    let mut tyds = ccx.tydescs.borrow_mut();
+    for (_, &val) in tyds.get().iter() {
         let ti = val;
 
         // Each of the glue functions needs to be cast to a generic type