---

yaml
---
r: 96972
b: refs/heads/dist-snap
c: d16cca1
h: refs/heads/master
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: 28943e96cb0f0dfb05b3b5ce604c5a0fb8e24095
+refs/heads/dist-snap: d16cca1f50d97e78334cba96bba0e6e0235cae7d
 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

@@ -2233,7 +2233,9 @@ pub fn trans_item(ccx: @mut CrateContext, item: &ast::item) {
                                       "cannot have static_assert on a mutable \
                                        static");
               }
-              let v = ccx.const_values.get_copy(&item.id);
+
+              let const_values = ccx.const_values.borrow();
+              let v = const_values.get().get_copy(&item.id);
               unsafe {
                   if !(llvm::LLVMConstIntGetZExtValue(v) != 0) {
                       ccx.sess.span_fatal(expr.span, "static assertion failed");
@@ -2489,7 +2491,11 @@ pub fn get_item_val(ccx: @mut CrateContext, id: ast::NodeId) -> ValueRef {
                             // We need the translated value here, because for enums the
                             // LLVM type is not fully determined by the Rust type.
                             let (v, inlineable) = consts::const_expr(ccx, expr);
-                            ccx.const_values.insert(id, v);
+                            {
+                                let mut const_values = ccx.const_values
+                                                          .borrow_mut();
+                                const_values.get().insert(id, v);
+                            }
                             let mut inlineable = inlineable;
 
                             unsafe {

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

@@ -157,7 +157,10 @@ fn const_deref(cx: &mut CrateContext, v: ValueRef, t: ty::t, explicit: bool)
 
 pub fn get_const_val(cx: @mut CrateContext,
                      mut def_id: ast::DefId) -> (ValueRef, bool) {
-    let contains_key = cx.const_values.contains_key(&def_id.node);
+    let contains_key = {
+        let const_values = cx.const_values.borrow();
+        const_values.get().contains_key(&def_id.node)
+    };
     if !ast_util::is_local(def_id) || !contains_key {
         if !ast_util::is_local(def_id) {
             def_id = inline::maybe_instantiate_inline(cx, def_id);
@@ -171,7 +174,9 @@ pub fn get_const_val(cx: @mut CrateContext,
             _ => cx.tcx.sess.bug("expected a const to be an item")
         }
     }
-    (cx.const_values.get_copy(&def_id.node),
+
+    let const_values = cx.const_values.borrow();
+    (const_values.get().get_copy(&def_id.node),
      !cx.non_inlineable_statics.contains(&def_id.node))
 }
 
@@ -642,7 +647,8 @@ pub fn trans_const(ccx: @mut CrateContext, m: ast::Mutability, id: ast::NodeId)
         let g = base::get_item_val(ccx, id);
         // At this point, get_item_val has already translated the
         // constant's initializer to determine its LLVM type.
-        let v = ccx.const_values.get_copy(&id);
+        let const_values = ccx.const_values.borrow();
+        let v = const_values.get().get_copy(&id);
         llvm::LLVMSetInitializer(g, v);
         if m != ast::MutMutable {
             llvm::LLVMSetGlobalConstant(g, True);

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

@@ -84,7 +84,7 @@ pub struct CrateContext {
      const_globals: RefCell<HashMap<int, ValueRef>>,
 
      // Cache of emitted const values
-     const_values: HashMap<ast::NodeId, ValueRef>,
+     const_values: RefCell<HashMap<ast::NodeId, ValueRef>>,
 
      // Cache of external const values
      extern_const_values: HashMap<ast::DefId, ValueRef>,
@@ -199,7 +199,7 @@ impl CrateContext {
                   vtables: RefCell::new(HashMap::new()),
                   const_cstr_cache: RefCell::new(HashMap::new()),
                   const_globals: RefCell::new(HashMap::new()),
-                  const_values: HashMap::new(),
+                  const_values: RefCell::new(HashMap::new()),
                   extern_const_values: HashMap::new(),
                   impl_method_cache: HashMap::new(),
                   module_data: HashMap::new(),