Skip to content

Commit

Permalink
Merge pull request #3906 from tautschnig/deprecation-conjunction
Browse files Browse the repository at this point in the history
Use conjunction instead of piecewise construction of and_exprt [blocks: #3800]
  • Loading branch information
tautschnig authored Jan 24, 2019
2 parents 68bc98d + 23e6e37 commit 3fe359e
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions src/goto-symex/slice_by_trace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,16 +288,10 @@ void symex_slice_by_tracet::compute_ts_back(
pvi++;
}

exprt val_merge=exprt(ID_and, typet(ID_bool));
val_merge.operands().reserve(eq_conds.size()+1);
val_merge.copy_to_operands(merge[j+1]);

for(const auto &eq_cond : eq_conds)
{
val_merge.copy_to_operands(eq_cond);
}

u_lhs.add_to_operands(std::move(val_merge));
exprt::operandst conjuncts(1, merge[j + 1]);
conjuncts.reserve(eq_conds.size() + 1);
conjuncts.insert(conjuncts.end(), eq_conds.begin(), eq_conds.end());
u_lhs.add_to_operands(conjunction(conjuncts));
}
else
{
Expand Down

0 comments on commit 3fe359e

Please sign in to comment.