From: Brian Demsky <bdemsky@uci.edu>
Date: Thu, 26 Dec 2019 08:02:34 +0000 (-0800)
Subject: Bug fix
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=d02738576d6be6a387d1aaf903b98c94a0a329c6;ds=sidebyside

Bug fix
---

diff --git a/execution.cc b/execution.cc
index 1c03a97a..504f7f52 100644
--- a/execution.cc
+++ b/execution.cc
@@ -1773,7 +1773,17 @@ void ModelExecution::collectActions() {
 		ModelAction *act = it->getVal();
 		//Do iteration early since we may delete node...
 		it=it->getPrev();
+		bool islastact = false;
+		ModelAction *lastact = get_last_action(act->get_tid());
+		if (act == lastact) {
+			Thread * th = get_thread(act);
+			islastact = !th->is_complete();
+		}
+
 		if (act->is_read()) {
+			if (islastact) {
+				act->set_read_from(NULL);
+			}
 			if (act->get_reads_from()->is_free()) {
 				removeAction(act);
 				delete act;
@@ -1788,6 +1798,10 @@ void ModelExecution::collectActions() {
 						act->set_last_fence_release(NULL);
 				}
 			}
+		}
+
+		if (islastact) {
+			continue;
 		} else if (act->is_free()) {
 			removeAction(act);
 			delete act;
@@ -1824,7 +1838,7 @@ void ModelExecution::collectActions() {
 					delete act;
 				}
 			} else if (act->is_create()) {
-				if (act->get_thread_operand()->get_state()==THREAD_COMPLETED) {
+				if (act->get_thread_operand()->is_complete()) {
 					removeAction(act);
 					delete act;
 				}