---

yaml
---
r: 147676
b: refs/heads/try2
c: 4603057
h: refs/heads/master
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: 7d3e25394f78bdcd9783460be26809807c8dacc1
+refs/heads/try2: 460305749c3b8c0a0726f490e7669f8259e6bbb9
 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

@@ -48,7 +48,7 @@ pub struct MoveData {
     /// Assignments to a path, like `x.f = foo`. These are not
     /// assigned dataflow bits, but we track them because they still
     /// kill move bits.
-    path_assignments: ~[Assignment],
+    path_assignments: RefCell<~[Assignment]>,
     assignee_ids: HashSet<ast::NodeId>,
 }
 
@@ -168,7 +168,7 @@ impl MoveData {
             paths: RefCell::new(~[]),
             path_map: RefCell::new(HashMap::new()),
             moves: RefCell::new(~[]),
-            path_assignments: ~[],
+            path_assignments: RefCell::new(~[]),
             var_assignments: ~[],
             assignee_ids: HashSet::new(),
         }
@@ -412,7 +412,10 @@ impl MoveData {
             debug!("add_assignment[path](lp={}, path_index={:?})",
                    lp.repr(tcx), path_index);
 
-            self.path_assignments.push(assignment);
+            {
+                let mut path_assignments = self.path_assignments.borrow_mut();
+                path_assignments.get().push(assignment);
+            }
         }
     }
 
@@ -440,8 +443,11 @@ impl MoveData {
             self.kill_moves(assignment.path, assignment.id, dfcx_moves);
         }
 
-        for assignment in self.path_assignments.iter() {
-            self.kill_moves(assignment.path, assignment.id, dfcx_moves);
+        {
+            let path_assignments = self.path_assignments.borrow();
+            for assignment in path_assignments.get().iter() {
+                self.kill_moves(assignment.path, assignment.id, dfcx_moves);
+            }
         }
 
         // Kill all moves related to a variable `x` when it goes out