From 6144dd79c2f94591ffdb10655322900629bb1b1e Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Thu, 10 Jan 2013 14:01:03 -0800 Subject: [PATCH] action: remove incorrect fence backtracking --- action.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/action.cc b/action.cc index acecd5a..6a545d8 100644 --- a/action.cc +++ b/action.cc @@ -298,15 +298,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 -- 2.34.1