projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5aff275
)
Tiny fix
author
weiyu
<weiyuluo1232@gmail.com>
Mon, 17 Feb 2020 19:50:20 +0000
(11:50 -0800)
committer
weiyu
<weiyuluo1232@gmail.com>
Mon, 17 Feb 2020 19:50:20 +0000
(11:50 -0800)
funcnode.cc
patch
|
blob
|
history
diff --git
a/funcnode.cc
b/funcnode.cc
index db39072becfe0ae67d759f8b656a372ade123d36..952824ce5db2df7c5a00a9616dd81a954a776c4a 100644
(file)
--- a/
funcnode.cc
+++ b/
funcnode.cc
@@
-295,6
+295,7
@@
void FuncNode::update_predicate_tree(ModelAction * next_act)
NewFuzzer * fuzzer = (NewFuzzer *)model->get_execution()->getFuzzer();
Predicate * selected_branch = fuzzer->get_selected_child_branch(tid);
NewFuzzer * fuzzer = (NewFuzzer *)model->get_execution()->getFuzzer();
Predicate * selected_branch = fuzzer->get_selected_child_branch(tid);
+ bool amended;
while (true) {
FuncInst * next_inst = get_inst(next_act);
next_inst->set_associated_read(tid, recursion_depth, this_marker, next_act->get_reads_from_value());
while (true) {
FuncInst * next_inst = get_inst(next_act);
next_inst->set_associated_read(tid, recursion_depth, this_marker, next_act->get_reads_from_value());
@@
-304,7
+305,7
@@
void FuncNode::update_predicate_tree(ModelAction * next_act)
// A branch with unset predicate expression is detected
if (!branch_found && unset_predicate != NULL) {
// A branch with unset predicate expression is detected
if (!branch_found && unset_predicate != NULL) {
-
bool
amended = amend_predicate_expr(curr_pred, next_inst, next_act);
+ amended = amend_predicate_expr(curr_pred, next_inst, next_act);
if (amended)
continue;
else {
if (amended)
continue;
else {
@@
-359,7
+360,7
@@
void FuncNode::update_predicate_tree(ModelAction * next_act)
}
// A check
}
// A check
- if (selected_branch != NULL)
+ if (selected_branch != NULL
&& !amended
)
ASSERT(selected_branch == curr_pred);
}
ASSERT(selected_branch == curr_pred);
}