From db607bcf0c5a0608e2f8e3364ec1c062a48bee03 Mon Sep 17 00:00:00 2001 From: Brian Demsky Date: Wed, 19 Sep 2012 17:42:13 -0700 Subject: [PATCH] fix merge --- model.cc | 9 --------- 1 file changed, 9 deletions(-) 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: { -- 2.34.1