---

yaml
---
r: 147573
b: refs/heads/try2
c: 0a0ce8d
h: refs/heads/master
i:
  147571: 441a6c0
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: 9f4cfe2e786e3a2f47b504d4a83dcdc70f29fb2c
+refs/heads/try2: 0a0ce8d227ceedd53924ce0a9afbac8d5604e3cb
 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

@@ -24,7 +24,7 @@ use middle::graph::{Direction, NodeIndex};
 use util::common::indenter;
 use util::ppaux::{Repr};
 
-use std::cell::RefCell;
+use std::cell::{Cell, RefCell};
 use std::hashmap::{HashMap, HashSet};
 use std::uint;
 use std::vec;
@@ -92,7 +92,7 @@ pub struct RegionVarBindings {
     constraints: RefCell<HashMap<Constraint, SubregionOrigin>>,
     lubs: CombineMap,
     glbs: CombineMap,
-    skolemization_count: uint,
+    skolemization_count: Cell<uint>,
     bound_count: uint,
 
     // The undo log records actions that might later be undone.
@@ -118,7 +118,7 @@ pub fn RegionVarBindings(tcx: ty::ctxt) -> RegionVarBindings {
         constraints: RefCell::new(HashMap::new()),
         lubs: HashMap::new(),
         glbs: HashMap::new(),
-        skolemization_count: 0,
+        skolemization_count: Cell::new(0),
         bound_count: 0,
         undo_log: ~[]
     }
@@ -188,8 +188,8 @@ impl RegionVarBindings {
     }
 
     pub fn new_skolemized(&mut self, br: ty::BoundRegion) -> Region {
-        let sc = self.skolemization_count;
-        self.skolemization_count += 1;
+        let sc = self.skolemization_count.get();
+        self.skolemization_count.set(sc + 1);
         ReInfer(ReSkolemized(sc, br))
     }