From: weiyu <weiyuluo1232@gmail.com>
Date: Mon, 17 Feb 2020 19:50:20 +0000 (-0800)
Subject: Tiny fix
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=7da037811c33ae78db573226a1c5a4907a967962

Tiny fix
---

diff --git a/funcnode.cc b/funcnode.cc
index db39072b..952824ce 100644
--- 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);
 
+	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());
@@ -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) {
-			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 {
@@ -359,7 +360,7 @@ void FuncNode::update_predicate_tree(ModelAction * next_act)
 	}
 
 	// A check
-	if (selected_branch != NULL)
+	if (selected_branch != NULL && !amended)
 		ASSERT(selected_branch == curr_pred);
 }