More code towards freeing old actions

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index eb979f8868a9de8097ca5cbb6c4be24a0bbaa2f8..9ef029882f5cf87ca32a72456a0251463356f67e 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -64,17 +64,6 @@ void Predicate::set_parent(Predicate * parent_pred)
 void Predicate::set_exit(Predicate * exit_pred)
 {
        exit = exit_pred;
-       exit_pred->add_pre_exit_predicate(this);
-}
-
-void Predicate::alloc_pre_exit_predicates()
-{
-       pre_exit_predicates = new ModelVector<Predicate *>();
-}
-
-void Predicate::add_pre_exit_predicate(Predicate * pred)
-{
-       pre_exit_predicates->push_back(pred);
 }
 
 void Predicate::copy_predicate_expr(Predicate * other)
@@ -89,22 +78,22 @@ void Predicate::copy_predicate_expr(Predicate * other)
        }
 }
 
-/* Return the single child branch of this predicate.
- * Return NULL if this predicate has no children.
+/* Follow the child if any child whose FuncInst matches with inst
+ *
+ * @param inst must be an ATOMIC_WRITE FuncInst
+ * @return NULL if no such child is found.
  */
-Predicate * Predicate::get_single_child(FuncInst * inst)
+Predicate * Predicate::follow_write_child(FuncInst * inst)
 {
-       int size = children.size();
-       if (size == 0)
-               return NULL;
-
-       /* Should only have one child */
-       ASSERT(size == 1);
-       Predicate * child = children[0];
+       ASSERT(inst->get_type() == ATOMIC_WRITE);
 
-       ASSERT(child->get_func_inst() == inst);
+       for (uint i = 0; i < children.size(); i++) {
+               Predicate * child = children[i];
+               if (child->get_func_inst() == inst)
+                       return child;
+       }
 
-       return child;
+       return NULL;
 }
 
 /* Evaluate predicate expressions against the given inst_act_map */