---

yaml
---
r: 88889
b: refs/heads/snap-stage3
c: 610096d
h: refs/heads/master
i:
  88887: 775fb86
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: deeca5d586bfaa4aa60246f671a8d611d38f6248
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: d3f58c59e48552612b8a177b527a5dcd0d6a1149
+refs/heads/snap-stage3: 610096d8c80275726183919a96a1f0c886acdb0e
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/base.rs

@@ -2450,7 +2450,11 @@ fn exported_name(ccx: &mut CrateContext, path: path, ty: ty::t, attrs: &[ast::At
 pub fn get_item_val(ccx: @mut CrateContext, id: ast::NodeId) -> ValueRef {
     debug!("get_item_val(id=`{:?}`)", id);
 
-    let val = ccx.item_vals.find_copy(&id);
+    let val = {
+        let item_vals = ccx.item_vals.borrow();
+        item_vals.get().find_copy(&id)
+    };
+
     match val {
         Some(v) => v,
         None => {
@@ -2689,7 +2693,8 @@ pub fn get_item_val(ccx: @mut CrateContext, id: ast::NodeId) -> ValueRef {
                 lib::llvm::SetLinkage(val, lib::llvm::InternalLinkage);
             }
 
-            ccx.item_vals.insert(id, val);
+            let mut item_vals = ccx.item_vals.borrow_mut();
+            item_vals.get().insert(id, val);
             val
         }
     }

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

@@ -47,7 +47,7 @@ pub struct CrateContext {
      tn: TypeNames,
      externs: ExternMap,
      intrinsics: HashMap<&'static str, ValueRef>,
-     item_vals: HashMap<ast::NodeId, ValueRef>,
+     item_vals: RefCell<HashMap<ast::NodeId, ValueRef>>,
      exp_map2: resolve::ExportMap2,
      reachable: @mut HashSet<ast::NodeId>,
      item_symbols: HashMap<ast::NodeId, ~str>,
@@ -187,7 +187,7 @@ impl CrateContext {
                   tn: tn,
                   externs: HashMap::new(),
                   intrinsics: intrinsics,
-                  item_vals: HashMap::new(),
+                  item_vals: RefCell::new(HashMap::new()),
                   exp_map2: emap2,
                   reachable: reachable,
                   item_symbols: HashMap::new(),