Store the set of predicate leaves in FuncNode

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index 473847337e60c5a9b85a8ad9ded6790edf779d14..ecb270b0625194d8d745cc45ad191a4f43aa54ce 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -60,9 +60,8 @@ public:
        ModelList<FuncNode *> * get_out_edges() { return &out_edges; }
        int compute_distance(FuncNode * target, int max_step = MAX_DIST);
 
+       void assign_base_score();
        void print_predicate_tree();
-       void print_val_loc_map();
-       void print_last_read(thread_id_t tid);
 
        MEMALLOC
 private:
@@ -89,8 +88,8 @@ private:
        func_inst_list_mt entry_insts;
 
        void infer_predicates(FuncInst * next_inst, ModelAction * next_act, HashTable<void *, ModelAction *, uintptr_t, 0> * loc_act_map, SnapVector<struct half_pred_expr *> * half_pred_expressions);
-       void generate_predicates(Predicate ** curr_pred, FuncInst * next_inst, SnapVector<struct half_pred_expr *> * half_pred_expressions);
-       bool amend_predicate_expr(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act);
+       void generate_predicates(Predicate * curr_pred, FuncInst * next_inst, SnapVector<struct half_pred_expr *> * half_pred_expressions);
+       bool amend_predicate_expr(Predicate * curr_pred, FuncInst * next_inst, ModelAction * next_act);
 
        /* Store action_lists when calls to update_tree are deferred */
        SnapList<action_list_t *> * action_list_buffer;
@@ -111,6 +110,7 @@ private:
 
        /* Run-time position in the predicate tree for each thread */
        ModelVector<Predicate *> predicate_tree_position;
+       PredSet predicate_leaves;
 
        /* Store the relation between this FuncNode and other FuncNodes */
        HashTable<FuncNode *, edge_type_t, uintptr_t, 0, model_malloc, model_calloc, model_free> edge_table;