X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=execution.cc;h=fc2370616388d0c60acf8048fceee307e33ef269;hb=eb6e8431496fc3dfd7638fbfba4229f7215f6308;hp=e962b92da41bb57193fc1bbcbf0b386514a35ec2;hpb=960e943616c59281fc10cd274ca04300d66c6391;p=model-checker.git

diff --git a/execution.cc b/execution.cc
index e962b92..fc23706 100644
--- a/execution.cc
+++ b/execution.cc
@@ -366,7 +366,10 @@ ModelAction * ModelExecution::get_last_fence_conflict(ModelAction *act) const
 ModelAction * ModelExecution::get_last_conflict(ModelAction *act) const
 {
 	switch (act->get_type()) {
-	/* case ATOMIC_FENCE: fences don't directly cause backtracking */
+	case ATOMIC_FENCE:
+		/* Only seq-cst fences can (directly) cause backtracking */
+		if (!act->is_seqcst())
+			break;
 	case ATOMIC_READ:
 	case ATOMIC_WRITE:
 	case ATOMIC_RMW: {