---

yaml
---
r: 147575
b: refs/heads/try2
c: b84f294
h: refs/heads/master
i:
  147573: 876a236
  147571: 441a6c0
  147567: ae1d187
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: bdfd0b5ae081240697fb087f59c42ab9ba070bef
+refs/heads/try2: b84f294c4672018e237e8196eef59bb668b805f2
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/typeck/infer/region_inference/mod.rs

@@ -90,8 +90,8 @@ pub struct RegionVarBindings {
     tcx: ty::ctxt,
     var_origins: ~[RegionVariableOrigin],
     constraints: RefCell<HashMap<Constraint, SubregionOrigin>>,
-    lubs: CombineMap,
-    glbs: CombineMap,
+    lubs: RefCell<CombineMap>,
+    glbs: RefCell<CombineMap>,
     skolemization_count: Cell<uint>,
     bound_count: Cell<uint>,
 
@@ -116,8 +116,8 @@ pub fn RegionVarBindings(tcx: ty::ctxt) -> RegionVarBindings {
         var_origins: ~[],
         values: None,
         constraints: RefCell::new(HashMap::new()),
-        lubs: HashMap::new(),
-        glbs: HashMap::new(),
+        lubs: RefCell::new(HashMap::new()),
+        glbs: RefCell::new(HashMap::new()),
         skolemization_count: Cell::new(0),
         bound_count: Cell::new(0),
         undo_log: ~[]
@@ -162,10 +162,12 @@ impl RegionVarBindings {
                 constraints.get().remove(constraint);
               }
               AddCombination(Glb, ref regions) => {
-                self.glbs.remove(regions);
+                let mut glbs = self.glbs.borrow_mut();
+                glbs.get().remove(regions);
               }
               AddCombination(Lub, ref regions) => {
-                self.lubs.remove(regions);
+                let mut lubs = self.lubs.borrow_mut();
+                lubs.get().remove(regions);
               }
             }
         }
@@ -345,10 +347,8 @@ impl RegionVarBindings {
         }
     }
 
-    fn combine_map<'a>(&'a mut self,
-                       t: CombineMapType)
-                       -> &'a mut CombineMap
-    {
+    fn combine_map<'a>(&'a mut self, t: CombineMapType)
+                   -> &'a mut RefCell<CombineMap> {
         match t {
             Glb => &mut self.glbs,
             Lub => &mut self.lubs,
@@ -365,14 +365,20 @@ impl RegionVarBindings {
                                  new_r: Region|)
                         -> Region {
         let vars = TwoRegions { a: a, b: b };
-        match self.combine_map(t).find(&vars) {
-            Some(&c) => {
-                return ReInfer(ReVar(c));
+        {
+            let map = self.combine_map(t).borrow();
+            match map.get().find(&vars) {
+                Some(&c) => {
+                    return ReInfer(ReVar(c));
+                }
+                None => {}
             }
-            None => {}
         }
         let c = self.new_region_var(infer::MiscVariable(origin.span()));
-        self.combine_map(t).insert(vars, c);
+        {
+            let mut map = self.combine_map(t).borrow_mut();
+            map.get().insert(vars, c);
+        }
         if self.in_snapshot() {
             self.undo_log.push(AddCombination(t, vars));
         }