From: Brian Norris <banorris@uci.edu>
Date: Tue, 18 Sep 2012 22:39:35 +0000 (-0700)
Subject: model: pull computation out of conditional
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=088be911a245fefcb5afa168c00c6106f22f336f

model: pull computation out of conditional
---

diff --git a/model.cc b/model.cc
index 7f1e49dc..e1e80fab 100644
--- 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);