Fix a bug in predicate.cc and declare 3 hashtables in funcnode.h as non-snapshotted...

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index b2c6e605c3354c91903115fa9385840970a1763c..9ef029882f5cf87ca32a72456a0251463356f67e 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -78,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;
+       ASSERT(inst->get_type() == ATOMIC_WRITE);
 
-       /* Should only have one child */
-       ASSERT(size == 1);
-       Predicate * child = children[0];
-
-       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 */