---

yaml
---
r: 96975
b: refs/heads/dist-snap
c: 8c194a0
h: refs/heads/master
i:
  96973: 8db583a
  96971: a6017ca
  96967: 5ad70d5
  96959: 0d6ff60
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: 1185fcc437e13cd1d492509361c29d05ee2548f6
+refs/heads/dist-snap: 8c194a013651869ae44440e319b28dabfaa08f50
 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

@@ -2917,14 +2917,19 @@ pub fn decl_gc_metadata(ccx: &mut CrateContext, llmod_id: &str) {
     unsafe {
         llvm::LLVMSetGlobalConstant(gc_metadata, True);
         lib::llvm::SetLinkage(gc_metadata, lib::llvm::ExternalLinkage);
-        ccx.module_data.insert(~"_gc_module_metadata", gc_metadata);
+
+        let mut module_data = ccx.module_data.borrow_mut();
+        module_data.get().insert(~"_gc_module_metadata", gc_metadata);
     }
 }
 
 pub fn create_module_map(ccx: &mut CrateContext) -> (ValueRef, uint) {
     let str_slice_type = Type::struct_([Type::i8p(), ccx.int_type], false);
     let elttype = Type::struct_([str_slice_type, ccx.int_type], false);
-    let maptype = Type::array(&elttype, ccx.module_data.len() as u64);
+    let maptype = {
+        let module_data = ccx.module_data.borrow();
+        Type::array(&elttype, module_data.get().len() as u64)
+    };
     let map = "_rust_mod_map".with_c_str(|buf| {
         unsafe {
             llvm::LLVMAddGlobal(ccx.llmod, maptype.to_ref(), buf)
@@ -2936,16 +2941,22 @@ pub fn create_module_map(ccx: &mut CrateContext) -> (ValueRef, uint) {
     // This is not ideal, but the borrow checker doesn't
     // like the multiple borrows. At least, it doesn't
     // like them on the current snapshot. (2013-06-14)
-    let mut keys = ~[];
-    for (k, _) in ccx.module_data.iter() {
-        keys.push(k.to_managed());
-    }
+    let keys = {
+        let mut keys = ~[];
+        let module_data = ccx.module_data.borrow();
+        for (k, _) in module_data.get().iter() {
+            keys.push(k.to_managed());
+        }
+        keys
+    };
 
     for key in keys.iter() {
-            let val = *ccx.module_data.find_equiv(key).unwrap();
+            let llestrval = C_estr_slice(ccx, *key);
+            let module_data = ccx.module_data.borrow();
+            let val = *module_data.get().find_equiv(key).unwrap();
             let v_ptr = p2i(ccx, val);
             let elt = C_struct([
-                C_estr_slice(ccx, *key),
+                llestrval,
                 v_ptr
             ], false);
             elts.push(elt);

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

@@ -91,7 +91,7 @@ pub struct CrateContext {
 
      impl_method_cache: RefCell<HashMap<(ast::DefId, ast::Name), ast::DefId>>,
 
-     module_data: HashMap<~str, ValueRef>,
+     module_data: RefCell<HashMap<~str, ValueRef>>,
      lltypes: HashMap<ty::t, Type>,
      llsizingtypes: HashMap<ty::t, Type>,
      adt_reprs: HashMap<ty::t, @adt::Repr>,
@@ -202,7 +202,7 @@ impl CrateContext {
                   const_values: RefCell::new(HashMap::new()),
                   extern_const_values: RefCell::new(HashMap::new()),
                   impl_method_cache: RefCell::new(HashMap::new()),
-                  module_data: HashMap::new(),
+                  module_data: RefCell::new(HashMap::new()),
                   lltypes: HashMap::new(),
                   llsizingtypes: HashMap::new(),
                   adt_reprs: HashMap::new(),

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

@@ -1813,8 +1813,15 @@ pub fn trans_log_level(bcx: @Block) -> DatumBlock {
         (modpath, modname)
     };
 
-    let global = if ccx.module_data.contains_key(&modname) {
-        ccx.module_data.get_copy(&modname)
+    let module_data_exists;
+    {
+        let module_data = ccx.module_data.borrow();
+        module_data_exists = module_data.get().contains_key(&modname);
+    }
+
+    let global = if module_data_exists {
+        let mut module_data = ccx.module_data.borrow_mut();
+        module_data.get().get_copy(&modname)
     } else {
         let s = link::mangle_internal_name_by_path_and_seq(
             ccx, modpath, "loglevel");
@@ -1827,8 +1834,11 @@ pub fn trans_log_level(bcx: @Block) -> DatumBlock {
             llvm::LLVMSetInitializer(global, C_null(Type::i32()));
             lib::llvm::SetLinkage(global, lib::llvm::InternalLinkage);
         }
-        ccx.module_data.insert(modname, global);
-        global
+        {
+            let mut module_data = ccx.module_data.borrow_mut();
+            module_data.get().insert(modname, global);
+            global
+        }
     };
 
     return immediate_rvalue_bcx(bcx, Load(bcx, global), ty::mk_u32());