From: Brian Norris <banorris@uci.edu>
Date: Fri, 10 Aug 2012 21:59:20 +0000 (-0700)
Subject: action: don't merge twice in read_from()
X-Git-Tag: pldi2013~271^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=16c741a1826b66ff5bb1f2b29311aa95cad08089;p=model-checker.git

action: don't merge twice in read_from()

synchronize_with() already takes care of the clock vector merging, so don't
merge a second time.
---

diff --git a/action.cc b/action.cc
index 131cb74..5c036ef 100644
--- 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;
 }