From: Brian Norris <banorris@uci.edu>
Date: Tue, 2 Oct 2012 18:16:12 +0000 (-0700)
Subject: model: revert broken bugfix
X-Git-Tag: pldi2013~126
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=ae7fcd2e5e499f72d9d1530bdc293f4fbc5f0644

model: revert broken bugfix

This reverts parts of the following commit:

 commit 7ba211ec7d1cacbaa3ef2027f1a0f534888f1708

The bugfix broke our basic test case (userprog)
---

diff --git a/nodestack.cc b/nodestack.cc
index 28bba4d..b33d247 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -325,11 +325,8 @@ const ModelAction * Node::get_read_from() {
 bool Node::increment_read_from() {
 	DBG();
 	promises.clear();
-	if ((read_from_index+1) < may_read_from.size()) {
-		read_from_index++;
-		return true;
-	}
-	return false;
+	read_from_index++;
+	return (read_from_index < may_read_from.size());
 }
 
 /**
@@ -339,11 +336,8 @@ bool Node::increment_read_from() {
 bool Node::increment_future_value() {
 	DBG();
 	promises.clear();
-	if ((future_index+1) < ((int)future_values.size())) {
-		future_index++;
-		return true;
-	}
-	return false;
+	future_index++;
+	return (future_index < (int)future_values.size());
 }
 
 void Node::explore(thread_id_t tid)