---

yaml
---
r: 147559
b: refs/heads/try2
c: a5db84c
h: refs/heads/master
i:
  147557: b9bec83
  147555: 5b1ebd6
  147551: 10f90f9
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 55a7b2feddfd54f5a4c5f4dd85d156a0da50428e
+refs/heads/try2: a5db84ce128ea1307c795bbee8a076d50725817a
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/const_eval.rs

@@ -154,9 +154,12 @@ pub fn lookup_const_by_id(tcx: ty::ctxt,
             Some(_) => None
         }
     } else {
-        match tcx.extern_const_statics.find(&def_id) {
-            Some(&e) => return e,
-            None => {}
+        {
+            let extern_const_statics = tcx.extern_const_statics.borrow();
+            match extern_const_statics.get().find(&def_id) {
+                Some(&e) => return e,
+                None => {}
+            }
         }
         let maps = astencode::Maps {
             root_map: @mut HashMap::new(),
@@ -173,8 +176,12 @@ pub fn lookup_const_by_id(tcx: ty::ctxt,
             },
             _ => None
         };
-        tcx.extern_const_statics.insert(def_id, e);
-        return e;
+        {
+            let mut extern_const_statics = tcx.extern_const_statics
+                                              .borrow_mut();
+            extern_const_statics.get().insert(def_id, e);
+            return e;
+        }
     }
 }
 

branches/try2/src/librustc/middle/ty.rs

@@ -368,7 +368,7 @@ struct ctxt_ {
 
     // These two caches are used by const_eval when decoding external statics
     // and variants that are found.
-    extern_const_statics: @mut HashMap<ast::DefId, Option<@ast::Expr>>,
+    extern_const_statics: RefCell<HashMap<ast::DefId, Option<@ast::Expr>>>,
     extern_const_variants: @mut HashMap<ast::DefId, Option<@ast::Expr>>,
 }
 
@@ -1014,7 +1014,7 @@ pub fn mk_ctxt(s: session::Session,
         populated_external_types: @mut HashSet::new(),
         populated_external_traits: @mut HashSet::new(),
 
-        extern_const_statics: @mut HashMap::new(),
+        extern_const_statics: RefCell::new(HashMap::new()),
         extern_const_variants: @mut HashMap::new(),
      }
 }