From: Brian Demsky <bdemsky@uci.edu>
Date: Thu, 20 Sep 2012 00:42:13 +0000 (-0700)
Subject: fix merge
X-Git-Tag: pldi2013~174
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=db607bcf0c5a0608e2f8e3364ec1c062a48bee03

fix merge
---

diff --git a/model.cc b/model.cc
index aec05ff..4f2d9e0 100644
--- a/model.cc
+++ b/model.cc
@@ -494,15 +494,6 @@ Thread * ModelChecker::check_current_action(ModelAction *curr)
 		build_reads_from_past(curr);
 	curr = newcurr;
 
-	/* Add the action to lists before any other model-checking tasks */
-	if (!second_part_of_rmw)
-		add_action_to_lists(newcurr);
-
-	/* Build may_read_from set for newly-created actions */
-	if (curr == newcurr && curr->is_read())
-		build_reads_from_past(curr);
-	curr = newcurr;
-
 	/* Thread specific actions */
 	switch (curr->get_type()) {
 	case THREAD_CREATE: {