From: Brian Norris <banorris@uci.edu>
Date: Thu, 5 Jul 2012 23:41:49 +0000 (-0700)
Subject: nodestack: build 'may_read_from' out of constant ModelActions
X-Git-Tag: pldi2013~379
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2ebb0b5a772c0bc5366c41c4980f3fd06f8081ae;p=model-checker.git

nodestack: build 'may_read_from' out of constant ModelActions

Make the 'may_read_from' set include only constant pointers.
---

diff --git a/nodestack.cc b/nodestack.cc
index f74a293..1338032 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -117,7 +117,7 @@ bool Node::is_enabled(Thread *t)
  * Add an action to the may_read_from set.
  * @param act is the action to add
  */
-void Node::add_read_from(ModelAction *act)
+void Node::add_read_from(const ModelAction *act)
 {
 	may_read_from.push_back(act);
 }
diff --git a/nodestack.h b/nodestack.h
index 5351d6c..0e95241 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -13,7 +13,7 @@
 
 class ModelAction;
 
-typedef std::list< ModelAction *, MyAlloc< ModelAction * > > action_set_t;
+typedef std::list< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
 
 /**
  * @brief A single node in a NodeStack
@@ -43,7 +43,7 @@ public:
 	 * occurred previously in the stack. */
 	Node * get_parent() const { return parent; }
 
-	void add_read_from(ModelAction *act);
+	void add_read_from(const ModelAction *act);
 
 	void print();
 
@@ -60,7 +60,7 @@ private:
 
 	/** The set of ModelActions that this the action at this Node may read
 	 *  from. Only meaningful if this Node represents a 'read' action. */
-	action_set_t may_read_from;
+	readfrom_set_t may_read_from;
 };
 
 typedef std::list< Node *, MyAlloc< Node * > > node_list_t;