librustc: De-@mut item_symbols

Author: pcwalton

src/librustc/metadata/encoder.rs

@@ -22,6 +22,7 @@ use middle::typeck;
 use middle;
 
 use std::cast;
+use std::cell::RefCell;
 use std::hashmap::{HashMap, HashSet};
 use std::io::mem::MemWriter;
 use std::io::{Writer, Seek, Decorator};
@@ -59,7 +60,7 @@ pub struct EncodeParams<'a> {
     diag: @mut span_handler,
     tcx: ty::ctxt,
     reexports2: middle::resolve::ExportMap2,
-    item_symbols: &'a HashMap<ast::NodeId, ~str>,
+    item_symbols: &'a RefCell<HashMap<ast::NodeId, ~str>>,
     discrim_symbols: &'a HashMap<ast::NodeId, @str>,
     non_inlineable_statics: &'a HashSet<ast::NodeId>,
     link_meta: &'a LinkMeta,
@@ -89,7 +90,7 @@ pub struct EncodeContext<'a> {
     tcx: ty::ctxt,
     stats: @mut Stats,
     reexports2: middle::resolve::ExportMap2,
-    item_symbols: &'a HashMap<ast::NodeId, ~str>,
+    item_symbols: &'a RefCell<HashMap<ast::NodeId, ~str>>,
     discrim_symbols: &'a HashMap<ast::NodeId, @str>,
     non_inlineable_statics: &'a HashSet<ast::NodeId>,
     link_meta: &'a LinkMeta,
@@ -283,7 +284,8 @@ fn encode_symbol(ecx: &EncodeContext,
                  ebml_w: &mut writer::Encoder,
                  id: NodeId) {
     ebml_w.start_tag(tag_items_data_item_symbol);
-    match ecx.item_symbols.find(&id) {
+    let item_symbols = ecx.item_symbols.borrow();
+    match item_symbols.get().find(&id) {
         Some(x) => {
             debug!("encode_symbol(id={:?}, str={})", id, *x);
             ebml_w.writer.write(x.as_bytes());
@@ -763,7 +765,8 @@ fn encode_info_for_struct_ctor(ecx: &EncodeContext,
     encode_path(ecx, ebml_w, path, ast_map::path_name(name));
     encode_parent_item(ebml_w, local_def(struct_id));
 
-    if ecx.item_symbols.contains_key(&ctor_id) {
+    let item_symbols = ecx.item_symbols.borrow();
+    if item_symbols.get().contains_key(&ctor_id) {
         encode_symbol(ecx, ebml_w, ctor_id);
     }
 

src/librustc/middle/trans/base.rs

@@ -2289,7 +2289,10 @@ pub fn trans_mod(ccx: @mut CrateContext, m: &ast::_mod) {
 
 fn finish_register_fn(ccx: @mut CrateContext, sp: Span, sym: ~str, node_id: ast::NodeId,
                       llfn: ValueRef) {
-    ccx.item_symbols.insert(node_id, sym);
+    {
+        let mut item_symbols = ccx.item_symbols.borrow_mut();
+        item_symbols.get().insert(node_id, sym);
+    }
 
     if !ccx.reachable.contains(&node_id) {
         lib::llvm::SetLinkage(llfn, lib::llvm::InternalLinkage);
@@ -2537,7 +2540,10 @@ pub fn get_item_val(ccx: @mut CrateContext, id: ast::NodeId) -> ValueRef {
                                     debug!("{} not inlined", sym);
                                     ccx.non_inlineable_statics.insert(id);
                                 }
-                                ccx.item_symbols.insert(i.id, sym);
+
+                                let mut item_symbols = ccx.item_symbols
+                                                          .borrow_mut();
+                                item_symbols.get().insert(i.id, sym);
                                 g
                             }
                         }
@@ -3195,7 +3201,8 @@ pub fn trans_crate(sess: session::Session,
     let link_meta = ccx.link_meta.clone();
     let llmod = ccx.llmod;
     let mut reachable = ccx.reachable.iter().filter_map(|id| {
-        ccx.item_symbols.find(id).map(|s| s.to_owned())
+        let item_symbols = ccx.item_symbols.borrow();
+        item_symbols.get().find(id).map(|s| s.to_owned())
     }).to_owned_vec();
 
     // Make sure that some other crucial symbols are not eliminated from the

src/librustc/middle/trans/context.rs

@@ -50,7 +50,7 @@ pub struct CrateContext {
      item_vals: RefCell<HashMap<ast::NodeId, ValueRef>>,
      exp_map2: resolve::ExportMap2,
      reachable: @mut HashSet<ast::NodeId>,
-     item_symbols: HashMap<ast::NodeId, ~str>,
+     item_symbols: RefCell<HashMap<ast::NodeId, ~str>>,
      link_meta: LinkMeta,
      enum_sizes: HashMap<ty::t, uint>,
      discrims: HashMap<ast::DefId, ValueRef>,
@@ -190,7 +190,7 @@ impl CrateContext {
                   item_vals: RefCell::new(HashMap::new()),
                   exp_map2: emap2,
                   reachable: reachable,
-                  item_symbols: HashMap::new(),
+                  item_symbols: RefCell::new(HashMap::new()),
                   link_meta: link_meta,
                   enum_sizes: HashMap::new(),
                   discrims: HashMap::new(),

src/librustc/middle/trans/foreign.rs

@@ -360,7 +360,8 @@ pub fn trans_foreign_mod(ccx: @mut CrateContext,
         }
 
         let lname = link_name(ccx, foreign_item);
-        ccx.item_symbols.insert(foreign_item.id, lname.to_owned());
+        let mut item_symbols = ccx.item_symbols.borrow_mut();
+        item_symbols.get().insert(foreign_item.id, lname.to_owned());
     }
 }