model: pull computation out of conditional

diff --git a/model.cc b/model.cc
index 7f1e49dc0ee0fbce09ecda84a3b044dfec311bbe..e1e80fab33be61f3f58600db19787b3118f28146 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -347,13 +347,12 @@ bool ModelChecker::process_write(ModelAction *curr)
  */
 Thread * ModelChecker::check_current_action(ModelAction *curr)
 {
-       bool second_part_of_rmw = false;
-
        ASSERT(curr);
 
+       bool second_part_of_rmw = curr->is_rmwc() || curr->is_rmw();
+
        if (curr->is_rmwc() || curr->is_rmw()) {
                ModelAction *tmp = process_rmw(curr);
-               second_part_of_rmw = true;
                delete curr;
                curr = tmp;
                compute_promises(curr);