X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.cc;fp=promise.cc;h=016b809aefaacf0d6e38e0674e60b89503bb3d31;hb=00bfb38e139e7ee131c137ae27f5e82ee642a9d8;hp=7f6f5e7b1823bb5dd3285196ba57f4ee172b0f37;hpb=ac4c9ec2a1ddb227fbe88ee505f7126485b94cb9;p=model-checker.git

diff --git a/promise.cc b/promise.cc
index 7f6f5e7..016b809 100644
--- a/promise.cc
+++ b/promise.cc
@@ -44,12 +44,10 @@ bool Promise::thread_is_eliminated(thread_id_t tid) const
  */
 bool Promise::has_failed() const
 {
-	unsigned int size = eliminated_thread.size();
-	int promise_tid = id_to_int(read->get_tid());
 	for (unsigned int i = 1; i < model->get_num_threads(); i++) {
-		if ((i >= size || !eliminated_thread[i]) && ((int)i != promise_tid) && model->is_enabled(int_to_id(i))) {
+		thread_id_t tid = int_to_id(i);
+		if (!thread_is_eliminated(tid) && model->is_enabled(tid))
 			return false;
-		}
 	}
 	return true;
 }