---

yaml
---
r: 96973
b: refs/heads/dist-snap
c: 37e3f2f
h: refs/heads/master
i:
  96971: a6017ca
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: d16cca1f50d97e78334cba96bba0e6e0235cae7d
+refs/heads/dist-snap: 37e3f2fe63a9e0a41d5ebca7d276401599f3e636
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -87,7 +87,7 @@ pub struct CrateContext {
      const_values: RefCell<HashMap<ast::NodeId, ValueRef>>,
 
      // Cache of external const values
-     extern_const_values: HashMap<ast::DefId, ValueRef>,
+     extern_const_values: RefCell<HashMap<ast::DefId, ValueRef>>,
 
      impl_method_cache: HashMap<(ast::DefId, ast::Name), ast::DefId>,
 
@@ -200,7 +200,7 @@ impl CrateContext {
                   const_cstr_cache: RefCell::new(HashMap::new()),
                   const_globals: RefCell::new(HashMap::new()),
                   const_values: RefCell::new(HashMap::new()),
-                  extern_const_values: HashMap::new(),
+                  extern_const_values: RefCell::new(HashMap::new()),
                   impl_method_cache: HashMap::new(),
                   module_data: HashMap::new(),
                   lltypes: HashMap::new(),

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

@@ -1018,8 +1018,10 @@ fn trans_lvalue_unadjusted(bcx: @Block, expr: &ast::Expr) -> DatumBlock {
                         PointerCast(bcx, val, pty)
                     } else {
                         {
-                            let extern_const_values = &bcx.ccx().extern_const_values;
-                            match extern_const_values.find(&did) {
+                            let extern_const_values = bcx.ccx()
+                                                         .extern_const_values
+                                                         .borrow();
+                            match extern_const_values.get().find(&did) {
                                 None => {}  // Continue.
                                 Some(llval) => {
                                     return *llval;
@@ -1037,8 +1039,9 @@ fn trans_lvalue_unadjusted(bcx: @Block, expr: &ast::Expr) -> DatumBlock {
                                                     llty.to_ref(),
                                                     buf)
                             });
-                            let extern_const_values = &mut bcx.ccx().extern_const_values;
-                            extern_const_values.insert(did, llval);
+                            let mut extern_const_values =
+                                bcx.ccx().extern_const_values.borrow_mut();
+                            extern_const_values.get().insert(did, llval);
                             llval
                         }
                     }