librustc: De-@mut node_types in the type context

Author: pcwalton

src/librustc/middle/astencode.rs

@@ -911,7 +911,8 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
     }
 
     {
-        let r = tcx.node_types.find(&(id as uint));
+        let node_types = tcx.node_types.borrow();
+        let r = node_types.get().find(&(id as uint));
         for &ty in r.iter() {
             ebml_w.tag(c::tag_table_node_type, |ebml_w| {
                 ebml_w.id(id);
@@ -1230,7 +1231,8 @@ fn decode_side_tables(xcx: @ExtendedDecodeContext,
                         let ty = val_dsr.read_ty(xcx);
                         debug!("inserting ty for node {:?}: {}",
                                id, ty_to_str(dcx.tcx, ty));
-                        dcx.tcx.node_types.insert(id as uint, ty);
+                        let mut node_types = dcx.tcx.node_types.borrow_mut();
+                        node_types.get().insert(id as uint, ty);
                     }
                     c::tag_table_node_type_subst => {
                         let tys = val_dsr.read_tys(xcx);

src/librustc/middle/trans/base.rs

@@ -2018,7 +2018,9 @@ fn insert_synthetic_type_entries(bcx: @Block,
 
         let pat_id = fn_args[i].pat.id;
         let arg_ty = arg_tys[i];
-        tcx.node_types.insert(pat_id as uint, arg_ty);
+
+        let mut node_types = tcx.node_types.borrow_mut();
+        node_types.get().insert(pat_id as uint, arg_ty);
     }
 }
 

src/librustc/middle/trans/debuginfo.rs

@@ -2259,7 +2259,8 @@ fn fn_should_be_ignored(fcx: &FunctionContext) -> bool {
 }
 
 fn assert_type_for_node_id(cx: &CrateContext, node_id: ast::NodeId, error_span: Span) {
-    if !cx.tcx.node_types.contains_key(&(node_id as uint)) {
+    let node_types = cx.tcx.node_types.borrow();
+    if !node_types.get().contains_key(&(node_id as uint)) {
         cx.sess.span_bug(error_span, "debuginfo: Could not find type for node id!");
     }
 }

src/librustc/middle/ty.rs

@@ -955,7 +955,7 @@ pub struct ty_param_substs_and_ty {
 
 type type_cache = RefCell<HashMap<ast::DefId, ty_param_bounds_and_ty>>;
 
-pub type node_type_table = @mut HashMap<uint,t>;
+pub type node_type_table = RefCell<HashMap<uint,t>>;
 
 pub fn mk_ctxt(s: session::Session,
                dm: resolve::DefMap,
@@ -975,7 +975,7 @@ pub fn mk_ctxt(s: session::Session,
         sess: s,
         def_map: dm,
         region_maps: region_maps,
-        node_types: @mut HashMap::new(),
+        node_types: RefCell::new(HashMap::new()),
         node_type_substs: RefCell::new(HashMap::new()),
         trait_refs: RefCell::new(HashMap::new()),
         trait_defs: RefCell::new(HashMap::new()),
@@ -2674,7 +2674,8 @@ pub fn node_id_to_trait_ref(cx: ctxt, id: ast::NodeId) -> @ty::TraitRef {
 
 pub fn node_id_to_type(cx: ctxt, id: ast::NodeId) -> t {
     //printfln!("{:?}/{:?}", id, cx.node_types.len());
-    match cx.node_types.find(&(id as uint)) {
+    let node_types = cx.node_types.borrow();
+    match node_types.get().find(&(id as uint)) {
        Some(&t) => t,
        None => cx.sess.bug(
            format!("node_id_to_type: no type for node `{}`",
@@ -3172,7 +3173,8 @@ pub fn expr_kind(tcx: ctxt,
         }
 
         ast::ExprCast(..) => {
-            match tcx.node_types.find(&(expr.id as uint)) {
+            let node_types = tcx.node_types.borrow();
+            match node_types.get().find(&(expr.id as uint)) {
                 Some(&t) => {
                     if type_is_trait(t) {
                         RvalueDpsExpr

src/librustc/middle/typeck/check/mod.rs

@@ -162,7 +162,7 @@ pub struct Inherited {
     param_env: ty::ParameterEnvironment,
 
     // Temporary tables:
-    node_types: @mut HashMap<ast::NodeId, ty::t>,
+    node_types: RefCell<HashMap<ast::NodeId, ty::t>>,
     node_type_substs: RefCell<HashMap<ast::NodeId, ty::substs>>,
     adjustments: RefCell<HashMap<ast::NodeId, @ty::AutoAdjustment>>,
     method_map: method_map,
@@ -262,7 +262,7 @@ impl Inherited {
             infcx: infer::new_infer_ctxt(tcx),
             locals: @mut HashMap::new(),
             param_env: param_env,
-            node_types: @mut HashMap::new(),
+            node_types: RefCell::new(HashMap::new()),
             node_type_substs: RefCell::new(HashMap::new()),
             adjustments: RefCell::new(HashMap::new()),
             method_map: @mut HashMap::new(),
@@ -1097,7 +1097,8 @@ impl FnCtxt {
     pub fn write_ty(&self, node_id: ast::NodeId, ty: ty::t) {
         debug!("write_ty({}, {}) in fcx {}",
                node_id, ppaux::ty_to_str(self.tcx(), ty), self.tag());
-        self.inh.node_types.insert(node_id, ty);
+        let mut node_types = self.inh.node_types.borrow_mut();
+        node_types.get().insert(node_id, ty);
     }
 
     pub fn write_substs(&self, node_id: ast::NodeId, substs: ty::substs) {
@@ -1160,7 +1161,8 @@ impl FnCtxt {
     }
 
     pub fn expr_ty(&self, ex: &ast::Expr) -> ty::t {
-        match self.inh.node_types.find(&ex.id) {
+        let node_types = self.inh.node_types.borrow();
+        match node_types.get().find(&ex.id) {
             Some(&t) => t,
             None => {
                 self.tcx().sess.bug(format!("no type for expr in fcx {}",
@@ -1170,7 +1172,8 @@ impl FnCtxt {
     }
 
     pub fn node_ty(&self, id: ast::NodeId) -> ty::t {
-        match self.inh.node_types.find(&id) {
+        let node_types = self.inh.node_types.borrow();
+        match node_types.get().find(&id) {
             Some(&t) => t,
             None => {
                 self.tcx().sess.bug(

src/librustc/middle/typeck/check/writeback.rs

@@ -206,7 +206,11 @@ fn maybe_resolve_type_vars_for_node(wbcx: &mut WbCtxt,
                                     sp: Span,
                                     id: ast::NodeId)
                                  -> Option<ty::t> {
-    if wbcx.fcx.inh.node_types.contains_key(&id) {
+    let contained = {
+        let node_types = wbcx.fcx.inh.node_types.borrow();
+        node_types.get().contains_key(&id)
+    };
+    if contained {
         resolve_type_vars_for_node(wbcx, sp, id)
     } else {
         None

src/librustc/middle/typeck/mod.rs

@@ -240,7 +240,8 @@ pub struct CrateCtxt {
 pub fn write_ty_to_tcx(tcx: ty::ctxt, node_id: ast::NodeId, ty: ty::t) {
     debug!("write_ty_to_tcx({}, {})", node_id, ppaux::ty_to_str(tcx, ty));
     assert!(!ty::type_needs_infer(ty));
-    tcx.node_types.insert(node_id as uint, ty);
+    let mut node_types = tcx.node_types.borrow_mut();
+    node_types.get().insert(node_id as uint, ty);
 }
 pub fn write_substs_to_tcx(tcx: ty::ctxt,
                            node_id: ast::NodeId,