X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=2336df2f4720f6bea613891859591ddf47488fc3;hb=1cc3e9dfadc5fe19200ef156bdaf1f05d3aa3616;hp=c86995bc9bbb555cf9e2381d1b7df91036330a46;hpb=15162a2ac08b0a6b06e5319a7424055f4d12e01c;p=c11tester.git diff --git a/clockvector.cc b/clockvector.cc index c86995bc..2336df2f 100644 --- a/clockvector.cc +++ b/clockvector.cc @@ -18,8 +18,7 @@ */ 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, const 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 */