push changes

[model-checker.git] / action.cc

diff --git a/action.cc b/action.cc
index f7ca249f965e6b351cd9763f382f9c792d586182..e5c9afe46f4cd81fff20555344b669c23c9b4bb1 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -217,7 +217,7 @@ void ModelAction::read_from(const ModelAction *act)
  * @param act The ModelAction to synchronize with
  */
 void ModelAction::synchronize_with(const ModelAction *act) {
-       ASSERT(*act < *this || type == THREAD_JOIN);
+       ASSERT(*act < *this || type == THREAD_JOIN || type == ATOMIC_LOCK );
        model->check_promises(cv, act->cv);
        cv->merge(act->cv);
 }