Skip to content

Commit e4c52cd

Browse files
author
Daniel Kroening
committed
use unary_exprt::op() instead of op0()
This will eventually allow us to protect exprt::opX().
1 parent 5730633 commit e4c52cd

File tree

6 files changed

+8
-11
lines changed

6 files changed

+8
-11
lines changed

jbmc/src/java_bytecode/java_bytecode_instrument.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -525,10 +525,8 @@ optionalt<codet> java_bytecode_instrumentt::instrument_expr(const exprt &expr)
525525
{
526526
// Check pointer non-null before access:
527527
const dereference_exprt &dereference_expr = to_dereference_expr(expr);
528-
codet null_dereference_check=
529-
check_null_dereference(
530-
dereference_expr.op0(),
531-
dereference_expr.source_location());
528+
codet null_dereference_check = check_null_dereference(
529+
dereference_expr.pointer(), dereference_expr.source_location());
532530
result.add(std::move(null_dereference_check));
533531
}
534532

jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ void validate_lambda_assignment(
5353
const typecast_exprt &rhs_value =
5454
require_expr::require_typecast(lambda_assignment.rhs());
5555

56-
const symbol_exprt &rhs_symbol =
57-
require_expr::require_symbol(rhs_value.op0());
56+
const symbol_exprt &rhs_symbol = require_expr::require_symbol(rhs_value.op());
5857

5958
const irep_idt &tmp_object_symbol = rhs_symbol.get_identifier();
6059

src/goto-programs/remove_complex.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,11 @@ static void remove_complex(exprt &expr)
217217

218218
if(expr.id()==ID_complex_real)
219219
{
220-
expr = complex_member(to_complex_real_expr(expr).op0(), ID_real);
220+
expr = complex_member(to_complex_real_expr(expr).op(), ID_real);
221221
}
222222
else if(expr.id()==ID_complex_imag)
223223
{
224-
expr = complex_member(to_complex_imag_expr(expr).op0(), ID_imag);
224+
expr = complex_member(to_complex_imag_expr(expr).op(), ID_imag);
225225
}
226226

227227
remove_complex(expr.type());

src/goto-programs/remove_vector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static void remove_vector(exprt &expr)
132132
exprt index=from_integer(i, array_type.size().type());
133133

134134
array_expr.operands()[i] = unary_exprt(
135-
unary_expr.id(), index_exprt(unary_expr.op0(), index, subtype));
135+
unary_expr.id(), index_exprt(unary_expr.op(), index, subtype));
136136
}
137137

138138
expr=array_expr;

src/solvers/flattening/boolbv_union.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ bvt boolbvt::convert_union(const union_exprt &expr)
4646
"endianness should be set to either little endian or big endian");
4747

4848
bv_endianness_mapt map_u(expr.type(), false, ns, boolbv_width);
49-
bv_endianness_mapt map_op(expr.op0().type(), false, ns, boolbv_width);
49+
bv_endianness_mapt map_op(expr.op().type(), false, ns, boolbv_width);
5050

5151
for(std::size_t i=0; i<op_bv.size(); i++)
5252
bv[map_u.map_bit(i)]=op_bv[map_op.map_bit(i)];

src/util/simplify_expr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ bool simplify_exprt::simplify_typecast(exprt &expr)
242242
const auto &typecast=expr_checked_cast<typecast_exprt>(expr.op0());
243243
if(typecast.op().type()==expr_type)
244244
{
245-
expr=typecast.op0();
245+
expr = typecast.op();
246246
return false;
247247
}
248248
}

0 commit comments

Comments
 (0)