fix a bug and print predicate tree in xdot syntax

[c11tester.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index 54e8c4a1a9b5188eb0b56875015f13950712eabd..2336df2f4720f6bea613891859591ddf47488fc3 100644 (file)
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -16,10 +16,9 @@
  * same thread or the parent that created this thread)
  * @param act is an action with which to update the ClockVector
  */
-ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
+ClockVector::ClockVector(ClockVector *parent, const ModelAction *act)
 {
-       ASSERT(act);
-       num_threads = int_to_id(act->get_tid()) + 1;
+       num_threads = act != NULL ? int_to_id(act->get_tid()) + 1 : 0;
        if (parent && parent->num_threads > num_threads)
                num_threads = parent->num_threads;
 
@@ -27,7 +26,8 @@ ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
        if (parent)
                std::memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
 
-       clock[id_to_int(act->get_tid())] = act->get_seq_number();
+       if (act != NULL)
+               clock[id_to_int(act->get_tid())] = act->get_seq_number();
 }
 
 /** @brief Destructor */