From: Brian Demsky <bdemsky@uci.edu>
Date: Wed, 19 Sep 2012 23:55:10 +0000 (-0700)
Subject: merge stuff
X-Git-Tag: pldi2013~177
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=15190694fd79202132be5f6e056fa5c00893664e

merge stuff
Merge branch 'master' into mutex

Conflicts:
	model.cc
	model.h
---

15190694fd79202132be5f6e056fa5c00893664e
diff --cc model.cc
index 6732c26,ec99b9a..b539aba
--- a/model.cc
+++ b/model.cc
@@@ -418,7 -361,6 +418,8 @@@ ModelAction * ModelChecker::initialize_
  		if (curr->is_rmwr())
  			newcurr->copy_typeandorder(curr);
  
 +		ASSERT(curr->get_location()==newcurr->get_location());
++
  		/* Discard duplicate ModelAction; use action from NodeStack */
  		delete curr;
  
@@@ -489,6 -409,6 +490,15 @@@ Thread * ModelChecker::check_current_ac
  		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: {