From: Brian Norris <banorris@uci.edu>
Date: Wed, 17 Apr 2013 17:50:25 +0000 (-0700)
Subject: execution: bugfix - no action "conflicts" with itself
X-Git-Tag: oopsla2013~42
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=3a4e118d45bf83a3b4c3a0a73d1071fa8fe5476d

execution: bugfix - no action "conflicts" with itself
---

diff --git a/execution.cc b/execution.cc
index fc23706..a74147b 100644
--- a/execution.cc
+++ b/execution.cc
@@ -380,6 +380,8 @@ ModelAction * ModelExecution::get_last_conflict(ModelAction *act) const
 		action_list_t::reverse_iterator rit;
 		for (rit = list->rbegin(); rit != list->rend(); rit++) {
 			ModelAction *prev = *rit;
+			if (prev == act)
+				continue;
 			if (prev->could_synchronize_with(act)) {
 				ret = prev;
 				break;