---

yaml
---
r: 16319
b: refs/heads/try
c: 594e01d
h: refs/heads/master
i:
  16317: 7f7ffd7
  16315: c394fb1
  16311: b2bf2bf
  16303: b1276b9
  16287: c9eab6a
  16255: 0066a47
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 7d17c2d87ff738aa2f4895255f99e2e89112cbb6
+refs/heads/try: 594e01d007bf83ab90380614653cf8e2a3a4cb99
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/liveness.rs

@@ -133,7 +133,7 @@ impl of to_str::to_str for variable {
 // assignment.  And so forth.
 
 impl methods for live_node {
-    fn is_valid() -> bool { *self != uint::max_value }
+    pure fn is_valid() -> bool { *self != uint::max_value }
 }
 
 fn invalid_node() -> live_node { live_node(uint::max_value) }
@@ -571,7 +571,7 @@ class liveness {
     fn live_on_exit(ln: live_node, var: variable)
         -> option<live_node_kind> {
 
-        self.live_on_entry(self.successors[*ln], var)
+        self.live_on_entry(copy self.successors[*ln], var)
     }
 
     fn used_on_entry(ln: live_node, var: variable) -> bool {
@@ -590,7 +590,7 @@ class liveness {
     fn assigned_on_exit(ln: live_node, var: variable)
         -> option<live_node_kind> {
 
-        self.assigned_on_entry(self.successors[*ln], var)
+        self.assigned_on_entry(copy self.successors[*ln], var)
     }
 
     fn indices(ln: live_node, op: fn(uint)) {
@@ -627,14 +627,14 @@ class liveness {
             wr.write_str("[ln(");
             wr.write_uint(*ln);
             wr.write_str(") of kind ");
-            wr.write_str(#fmt["%?", self.ir.lnks[*ln]]);
+            wr.write_str(#fmt["%?", copy self.ir.lnks[*ln]]);
             wr.write_str(" reads");
             self.write_vars(wr, ln, {|idx| self.users[idx].reader});
             wr.write_str("  writes");
             self.write_vars(wr, ln, {|idx| self.users[idx].writer});
             wr.write_str(" ");
             wr.write_str(" precedes ");
-            wr.write_str(self.successors[*ln].to_str());
+            wr.write_str((copy self.successors[*ln]).to_str());
             wr.write_str("]");
         }
     }
@@ -668,9 +668,9 @@ class liveness {
 
         let mut changed = false;
         self.indices2(ln, succ_ln) { |idx, succ_idx|
-            changed |= copy_if_invalid(self.users[succ_idx].reader,
+            changed |= copy_if_invalid(copy self.users[succ_idx].reader,
                                        self.users[idx].reader);
-            changed |= copy_if_invalid(self.users[succ_idx].writer,
+            changed |= copy_if_invalid(copy self.users[succ_idx].writer,
                                        self.users[idx].writer);
             if self.users[succ_idx].used && !self.users[idx].used {
                 self.users[idx].used = true;