action: don't merge twice in read_from()
authorBrian Norris <banorris@uci.edu>
Fri, 10 Aug 2012 21:59:20 +0000 (14:59 -0700)
committerBrian Norris <banorris@uci.edu>
Thu, 16 Aug 2012 17:30:26 +0000 (10:30 -0700)
synchronize_with() already takes care of the clock vector merging, so don't
merge a second time.

action.cc

index 131cb74..5c036ef 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -167,7 +167,6 @@ void ModelAction::read_from(const ModelAction *act)
        ASSERT(cv);
        if (act!=NULL && act->is_release() && this->is_acquire()) {
                synchronize_with(act);
-               cv->merge(act->cv);
        }
        reads_from = act;
 }