Skip to content

Commit 133bdb3

Browse files
author
Daniel Kroening
committed
avoid exprt::op0, exprt::op1, exprt::op2
1 parent 961d974 commit 133bdb3

12 files changed

+123
-123
lines changed

src/analyses/constant_propagator.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,8 @@ void constant_propagator_ait::replace(
631631
d.partial_evaluate(rhs, ns);
632632

633633
if(rhs.id()==ID_constant)
634-
rhs.add_source_location()=it->code.op0().source_location();
634+
rhs.add_source_location() =
635+
to_code_assign(it->code).lhs().source_location();
635636
}
636637
else if(it->is_function_call())
637638
{

src/analyses/escape_analysis.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ void escape_domaint::get_rhs_aliases(
142142
}
143143
else if(rhs.id()==ID_address_of)
144144
{
145-
get_rhs_aliases_address_of(to_address_of_expr(rhs).op0(), alias_set);
145+
get_rhs_aliases_address_of(to_address_of_expr(rhs).op(), alias_set);
146146
}
147147
}
148148

src/analyses/flow_insensitive_analysis.cpp

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -317,24 +317,15 @@ bool flow_insensitive_analysis_baset::do_function_call_rec(
317317
}
318318
else if(function.id()==ID_if)
319319
{
320-
if(function.operands().size()!=3)
321-
throw "if takes three arguments";
320+
const auto &if_expr = to_if_expr(function);
322321

323-
new_data =
324-
do_function_call_rec(
325-
l_call,
326-
function.op1(),
327-
arguments,
328-
state,
329-
goto_functions);
322+
new_data = do_function_call_rec(
323+
l_call, if_expr.true_case(), arguments, state, goto_functions);
330324

331325
new_data =
332326
do_function_call_rec(
333-
l_call,
334-
function.op2(),
335-
arguments,
336-
state,
337-
goto_functions) || new_data;
327+
l_call, if_expr.false_case(), arguments, state, goto_functions) ||
328+
new_data;
338329
}
339330
else if(function.id()==ID_dereference)
340331
{

src/analyses/global_may_alias.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void global_may_alias_domaint::get_rhs_aliases(
6262
}
6363
else if(rhs.id()==ID_address_of)
6464
{
65-
get_rhs_aliases_address_of(to_address_of_expr(rhs).op0(), alias_set);
65+
get_rhs_aliases_address_of(to_address_of_expr(rhs).object(), alias_set);
6666
}
6767
}
6868

src/analyses/interval_domain.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -339,25 +339,25 @@ void interval_domaint::assume_rec(
339339
cond.id()==ID_gt || cond.id()==ID_ge ||
340340
cond.id()==ID_equal || cond.id()==ID_notequal)
341341
{
342-
assert(cond.operands().size()==2);
342+
const auto &rel = to_binary_relation_expr(cond);
343343

344344
if(negation) // !x<y ---> x>=y
345345
{
346-
if(cond.id()==ID_lt)
347-
assume_rec(cond.op0(), ID_ge, cond.op1());
348-
else if(cond.id()==ID_le)
349-
assume_rec(cond.op0(), ID_gt, cond.op1());
350-
else if(cond.id()==ID_gt)
351-
assume_rec(cond.op0(), ID_le, cond.op1());
352-
else if(cond.id()==ID_ge)
353-
assume_rec(cond.op0(), ID_lt, cond.op1());
354-
else if(cond.id()==ID_equal)
355-
assume_rec(cond.op0(), ID_notequal, cond.op1());
356-
else if(cond.id()==ID_notequal)
357-
assume_rec(cond.op0(), ID_equal, cond.op1());
346+
if(rel.id() == ID_lt)
347+
assume_rec(rel.op0(), ID_ge, rel.op1());
348+
else if(rel.id() == ID_le)
349+
assume_rec(rel.op0(), ID_gt, rel.op1());
350+
else if(rel.id() == ID_gt)
351+
assume_rec(rel.op0(), ID_le, rel.op1());
352+
else if(rel.id() == ID_ge)
353+
assume_rec(rel.op0(), ID_lt, rel.op1());
354+
else if(rel.id() == ID_equal)
355+
assume_rec(rel.op0(), ID_notequal, rel.op1());
356+
else if(rel.id() == ID_notequal)
357+
assume_rec(rel.op0(), ID_equal, rel.op1());
358358
}
359359
else
360-
assume_rec(cond.op0(), cond.id(), cond.op1());
360+
assume_rec(rel.op0(), rel.id(), rel.op1());
361361
}
362362
else if(cond.id()==ID_not)
363363
{

0 commit comments

Comments
 (0)