---

yaml
---
r: 88944
b: refs/heads/snap-stage3
c: b976226
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

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

branches/snap-stage3/src/librustc/middle/const_eval.rs

@@ -111,9 +111,12 @@ pub fn lookup_variant_by_id(tcx: ty::ctxt,
             Some(_) => None
         }
     } else {
-        match tcx.extern_const_variants.find(&variant_def) {
-            Some(&e) => return e,
-            None => {}
+        {
+            let extern_const_variants = tcx.extern_const_variants.borrow();
+            match extern_const_variants.get().find(&variant_def) {
+                Some(&e) => return e,
+                None => {}
+            }
         }
         let maps = astencode::Maps {
             root_map: @mut HashMap::new(),
@@ -136,8 +139,12 @@ pub fn lookup_variant_by_id(tcx: ty::ctxt,
             },
             _ => None
         };
-        tcx.extern_const_variants.insert(variant_def, e);
-        return e;
+        {
+            let mut extern_const_variants = tcx.extern_const_variants
+                                               .borrow_mut();
+            extern_const_variants.get().insert(variant_def, e);
+            return e;
+        }
     }
 }
 

branches/snap-stage3/src/librustc/middle/ty.rs

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