---

yaml
---
r: 147547
b: refs/heads/try2
c: 4dc923f
h: refs/heads/master
i:
  147545: b892e78
  147543: 614ddfe
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 5b98c66593660cfa4ee4d39aabeaa97bb36eb75f
+refs/heads/try2: 4dc923fbda6f55a15583ed5f60aef08c1faf2cba
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/ty.rs

@@ -313,7 +313,7 @@ struct ctxt_ {
     enum_var_cache: RefCell<HashMap<DefId, @~[@VariantInfo]>>,
     ty_param_defs: RefCell<HashMap<ast::NodeId, TypeParameterDef>>,
     adjustments: RefCell<HashMap<ast::NodeId, @AutoAdjustment>>,
-    normalized_cache: @mut HashMap<t, t>,
+    normalized_cache: RefCell<HashMap<t, t>>,
     lang_items: middle::lang_items::LanguageItems,
     // A mapping of fake provided method def_ids to the default implementation
     provided_method_sources: RefCell<HashMap<ast::DefId, ast::DefId>>,
@@ -961,10 +961,6 @@ fn mk_rcache() -> creader_cache {
     return @mut HashMap::new();
 }
 
-pub fn new_ty_hash<V:'static>() -> @mut HashMap<t, V> {
-    @mut HashMap::new()
-}
-
 pub fn mk_ctxt(s: session::Session,
                dm: resolve::DefMap,
                named_region_map: @mut resolve_lifetime::NamedRegionMap,
@@ -1003,7 +999,7 @@ pub fn mk_ctxt(s: session::Session,
         impl_trait_cache: RefCell::new(HashMap::new()),
         ty_param_defs: RefCell::new(HashMap::new()),
         adjustments: RefCell::new(HashMap::new()),
-        normalized_cache: new_ty_hash(),
+        normalized_cache: RefCell::new(HashMap::new()),
         lang_items: lang_items,
         provided_method_sources: RefCell::new(HashMap::new()),
         supertraits: RefCell::new(HashMap::new()),
@@ -4265,13 +4261,20 @@ pub fn normalize_ty(cx: ctxt, t: t) -> t {
         fn tcx(&self) -> ty::ctxt { **self }
 
         fn fold_ty(&mut self, t: ty::t) -> ty::t {
-            match self.tcx().normalized_cache.find_copy(&t) {
+            let normalized_opt = {
+                let normalized_cache = self.tcx().normalized_cache.borrow();
+                normalized_cache.get().find_copy(&t)
+            };
+            match normalized_opt {
                 Some(u) => {
                     return u;
                 }
                 None => {
                     let t_norm = ty_fold::super_fold_ty(self, t);
-                    self.tcx().normalized_cache.insert(t, t_norm);
+                    let mut normalized_cache = self.tcx()
+                                                   .normalized_cache
+                                                   .borrow_mut();
+                    normalized_cache.get().insert(t, t_norm);
                     return t_norm;
                 }
             }