From: Brian Norris <banorris@uci.edu>
Date: Tue, 12 Feb 2013 19:48:41 +0000 (-0800)
Subject: Merge branch 'fences'
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=9aae08ba6d60aa253039d2da1c3571fdde2ac159;hp=f1ecfba94c7ceb77c071ffa906cd6d51f66f8ee3

Merge branch 'fences'
---

diff --git a/action.cc b/action.cc
index 72ca4726..d5eb581a 100644
--- a/action.cc
+++ b/action.cc
@@ -299,15 +299,13 @@ bool ModelAction::could_synchronize_with(const ModelAction *act) const
 	if (!same_var(act))
 		return false;
 
-	// Explore interleavings of seqcst writes/fences to guarantee total
+	// Explore interleavings of seqcst writes to guarantee total
 	// order of seq_cst operations that don't commute
-	if ((could_be_write() || act->could_be_write() || is_fence() || act->is_fence())
-			&& is_seqcst() && act->is_seqcst())
+	if ((could_be_write() || act->could_be_write()) && is_seqcst() && act->is_seqcst())
 		return true;
 
-	// Explore synchronizing read/write/fence pairs
-	if (is_acquire() && act->is_release() && (is_read() || is_fence()) &&
-			(act->could_be_write() || act->is_fence()))
+	// Explore synchronizing read/write pairs
+	if (is_acquire() && act->is_release() && is_read() && act->could_be_write())
 		return true;
 
 	// lock just released...we can grab lock