---

yaml
---
r: 90724
b: refs/heads/master
c: 28943e9
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0e2041c54b3065cc285ae19744e8acbff7533890
+refs/heads/master: 28943e96cb0f0dfb05b3b5ce604c5a0fb8e24095
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/src/librustc/middle/trans/consts.rs

@@ -79,7 +79,8 @@ pub fn const_lit(cx: &mut CrateContext, e: &ast::Expr, lit: ast::lit)
 pub fn const_ptrcast(cx: &mut CrateContext, a: ValueRef, t: Type) -> ValueRef {
     unsafe {
         let b = llvm::LLVMConstPointerCast(a, t.ptr_to().to_ref());
-        assert!(cx.const_globals.insert(b as int, a));
+        let mut const_globals = cx.const_globals.borrow_mut();
+        assert!(const_globals.get().insert(b as int, a));
         b
     }
 }
@@ -111,7 +112,8 @@ fn const_addr_of(cx: &mut CrateContext, cv: ValueRef) -> ValueRef {
 }
 
 fn const_deref_ptr(cx: &mut CrateContext, v: ValueRef) -> ValueRef {
-    let v = match cx.const_globals.find(&(v as int)) {
+    let const_globals = cx.const_globals.borrow();
+    let v = match const_globals.get().find(&(v as int)) {
         Some(&v) => v,
         None => v
     };

trunk/src/librustc/middle/trans/context.rs

@@ -81,7 +81,7 @@ pub struct CrateContext {
      // when we ptrcast, and we have to ptrcast during translation
      // of a [T] const because we form a slice, a [*T,int] pair, not
      // a pointer to an LLVM array type.
-     const_globals: HashMap<int, ValueRef>,
+     const_globals: RefCell<HashMap<int, ValueRef>>,
 
      // Cache of emitted const values
      const_values: HashMap<ast::NodeId, ValueRef>,
@@ -198,7 +198,7 @@ impl CrateContext {
                   monomorphizing: RefCell::new(HashMap::new()),
                   vtables: RefCell::new(HashMap::new()),
                   const_cstr_cache: RefCell::new(HashMap::new()),
-                  const_globals: HashMap::new(),
+                  const_globals: RefCell::new(HashMap::new()),
                   const_values: HashMap::new(),
                   extern_const_values: HashMap::new(),
                   impl_method_cache: HashMap::new(),