---

yaml
---
r: 147675
b: refs/heads/try2
c: 7d3e253
h: refs/heads/master
i:
  147673: 1b2e69e
  147671: 493ec3a
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: 1b8391ca12c5465a78673b0ba5ea4d338e487fb1
+refs/heads/try2: 7d3e25394f78bdcd9783460be26809807c8dacc1
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/borrowck/move_data.rs

@@ -35,7 +35,7 @@ pub struct MoveData {
     paths: RefCell<~[MovePath]>,
 
     /// Cache of loan path to move path index, for easy lookup.
-    path_map: HashMap<@LoanPath, MovePathIndex>,
+    path_map: RefCell<HashMap<@LoanPath, MovePathIndex>>,
 
     /// Each move or uninitialized variable gets an entry here.
     moves: RefCell<~[Move]>,
@@ -166,7 +166,7 @@ impl MoveData {
     pub fn new() -> MoveData {
         MoveData {
             paths: RefCell::new(~[]),
-            path_map: HashMap::new(),
+            path_map: RefCell::new(HashMap::new()),
             moves: RefCell::new(~[]),
             path_assignments: ~[],
             var_assignments: ~[],
@@ -234,11 +234,14 @@ impl MoveData {
          * base paths that do not yet have an index.
          */
 
-        match self.path_map.find(&lp) {
-            Some(&index) => {
-                return index;
+        {
+            let path_map = self.path_map.borrow();
+            match path_map.get().find(&lp) {
+                Some(&index) => {
+                    return index;
+                }
+                None => {}
             }
-            None => {}
         }
 
         let index = match *lp {
@@ -289,14 +292,17 @@ impl MoveData {
 
         let paths = self.paths.borrow();
         assert_eq!(*index, paths.get().len() - 1);
-        self.path_map.insert(lp, index);
+
+        let mut path_map = self.path_map.borrow_mut();
+        path_map.get().insert(lp, index);
         return index;
     }
 
     fn existing_move_path(&self,
                           lp: @LoanPath)
                           -> Option<MovePathIndex> {
-        self.path_map.find_copy(&lp)
+        let path_map = self.path_map.borrow();
+        path_map.get().find_copy(&lp)
     }
 
     fn existing_base_paths(&self,
@@ -315,7 +321,11 @@ impl MoveData {
          * paths of `lp` to `result`, but does not add new move paths
          */
 
-        match self.path_map.find_copy(&lp) {
+        let index_opt = {
+            let path_map = self.path_map.borrow();
+            path_map.get().find_copy(&lp)
+        };
+        match index_opt {
             Some(index) => {
                 self.each_base_path(index, |p| {
                     result.push(p);
@@ -442,7 +452,10 @@ impl MoveData {
                 match *path.loan_path {
                     LpVar(id) => {
                         let kill_id = tcx.region_maps.encl_scope(id);
-                        let path = *self.path_map.get(&path.loan_path);
+                        let path = {
+                            let path_map = self.path_map.borrow();
+                            *path_map.get().get(&path.loan_path)
+                        };
                         self.kill_moves(path, kill_id, dfcx_moves);
                     }
                     LpExtend(..) => {}