From 63e202b2db7a90e176db54c864d2e54ec535c03f Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Tue, 5 Feb 2013 17:39:36 -0800 Subject: [PATCH] model: cosmetic improvements to resolve_promises() Rename 'resolved' to 'haveResolved', since we will use the 'resolved' name for something else. --- model.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/model.cc b/model.cc index 691ab832..465849af 100644 --- a/model.cc +++ b/model.cc @@ -2331,7 +2331,7 @@ ClockVector * ModelChecker::get_cv(thread_id_t tid) const */ bool ModelChecker::resolve_promises(ModelAction *write) { - bool resolved = false; + bool haveResolved = false; std::vector< ModelAction *, ModelAlloc > actions_to_check; for (unsigned int i = 0, promise_index = 0; promise_index < promises->size(); i++) { @@ -2349,13 +2349,13 @@ bool ModelChecker::resolve_promises(ModelAction *write) //after the read. post_r_modification_order(read, write); //Make sure the promise's value matches the write's value - ASSERT(promise->get_value() == write->get_value()); + ASSERT(promise->is_compatible(write)); delete promise; promises->erase(promises->begin() + promise_index); actions_to_check.push_back(read); - resolved = true; + haveResolved = true; } else promise_index++; } @@ -2364,11 +2364,11 @@ bool ModelChecker::resolve_promises(ModelAction *write) //resolve promises for (unsigned int i = 0; i < actions_to_check.size(); i++) { - ModelAction *read=actions_to_check[i]; + ModelAction *read = actions_to_check[i]; mo_check_promises(read->get_tid(), write, read); } - return resolved; + return haveResolved; } /** -- 2.34.1