---

yaml
---
r: 3346
b: refs/heads/master
c: afa6321
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7432017d5ef4c2adc611bfd8efc6055902a25e4c
+refs/heads/master: afa632124f149b190ff3fb0a625a6a162637d82c

trunk/src/comp/middle/tstate/auxiliary.rs

@@ -436,22 +436,8 @@ fn set_postcond_false(&crate_ctxt ccx, node_id id) {
 }
 
 fn pure_exp(&crate_ctxt ccx, node_id id, &prestate p) -> bool {
-    auto changed = false;
-    changed = extend_prestate_ann(ccx, id, p) || changed;
-    changed = extend_poststate_ann(ccx, id, p) || changed;
-    ret changed;
-}
-
-fn fixed_point_states(&fn_ctxt fcx, fn(&fn_ctxt, &_fn) -> bool  f,
-                      &_fn start) {
-    auto changed = f(fcx, start);
-    if (changed) {
-        ret fixed_point_states(fcx, f, start);
-    } else {
-        // we're done!
-
-        ret;
-    }
+    ret extend_prestate_ann(ccx, id, p) |
+        extend_poststate_ann(ccx, id, p);
 }
 
 fn num_constraints(fn_info m) -> uint { ret m.num_constraints; }
@@ -733,7 +719,7 @@ fn forget_in_poststate(&fn_ctxt fcx, &poststate p, node_id dead_v) -> bool {
         case (some(?d_id)) {
             for (norm_constraint c in constraints(fcx)) {
                 if (constraint_mentions(fcx, c, d_id)) {
-                    changed = clear_in_poststate_(c.bit_num, p) || changed;
+                    changed |= clear_in_poststate_(c.bit_num, p);
                 }
             }
         }
@@ -752,7 +738,7 @@ fn forget_in_poststate_still_init(&fn_ctxt fcx, &poststate p, node_id dead_v)
         case (some(?d_id)) {
             for (norm_constraint c in constraints(fcx)) {
                 if (non_init_constraint_mentions(fcx, c, d_id)) {
-                    changed = clear_in_poststate_(c.bit_num, p) || changed;
+                    changed |= clear_in_poststate_(c.bit_num, p);
                 }
             }
         }

trunk/src/comp/middle/tstate/ck.rs

@@ -51,7 +51,6 @@ import aux::expr_poststate;
 import aux::stmt_poststate;
 import aux::stmt_to_ann;
 import aux::num_constraints;
-import aux::fixed_point_states;
 import aux::tritv_to_str;
 import aux::first_difference_string;
 import pretty::pprust::ty_to_str;
@@ -176,8 +175,9 @@ fn check_states_against_conditions(&fn_ctxt fcx, &_fn f, node_id id,
 fn check_fn_states(&fn_ctxt fcx, &_fn f, node_id id, &span sp, &fn_ident i) {
     /* Compute the pre- and post-states for this function */
 
-    auto g = find_pre_post_state_fn;
-    fixed_point_states(fcx, g, f);
+    // Fixpoint iteration
+    while (find_pre_post_state_fn(fcx, f)) {}
+
     /* Now compare each expr's pre-state to its precondition
        and post-state to its postcondition */