Skip to content

Commit cdb0133

Browse files
committed
Use plus_exprt constructor that does not take a type
The type of the plus_exprt is the type of the lhs by default. This is always the case in the code base.
1 parent fda5ca0 commit cdb0133

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

jbmc/src/java_bytecode/java_bytecode_convert_method.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2838,7 +2838,7 @@ exprt java_bytecode_convert_methodt::convert_aload(
28382838
const member_exprt data_ptr(
28392839
deref, "data", pointer_type(java_type_from_char(type_char)));
28402840

2841-
plus_exprt data_plus_offset(data_ptr, op[1], data_ptr.type());
2841+
plus_exprt data_plus_offset{data_ptr, op[1]};
28422842
// tag it so it's easy to identify during instrumentation
28432843
data_plus_offset.set(ID_java_array_access, true);
28442844
const dereference_exprt element{data_plus_offset};
@@ -2886,7 +2886,7 @@ code_blockt java_bytecode_convert_methodt::convert_astore(
28862886
const member_exprt data_ptr(
28872887
deref, "data", pointer_type(java_type_from_char(type_char)));
28882888

2889-
plus_exprt data_plus_offset(data_ptr, op[1], data_ptr.type());
2889+
plus_exprt data_plus_offset{data_ptr, op[1]};
28902890
// tag it so it's easy to identify during instrumentation
28912891
data_plus_offset.set(ID_java_array_access, true);
28922892
const dereference_exprt element{data_plus_offset};

jbmc/src/java_bytecode/java_object_factory.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ void java_object_factoryt::array_loop_init_code(
12011201
}
12021202

12031203
const dereference_exprt arraycellref{
1204-
plus_exprt{array_init_symexpr, counter_expr, array_init_symexpr.type()}};
1204+
plus_exprt{array_init_symexpr, counter_expr}};
12051205

12061206
bool new_item_is_primitive = arraycellref.type().id() != ID_pointer;
12071207

src/analyses/goto_check.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ goto_checkt::address_check(const exprt &address, const exprt &size)
11061106

11071107
binary_relation_exprt lb_check(a.first, ID_le, int_ptr);
11081108

1109-
plus_exprt ub(int_ptr, size, int_ptr.type());
1109+
plus_exprt ub{int_ptr, size};
11101110

11111111
binary_relation_exprt ub_check(ub, ID_le, plus_exprt(a.first, a.second));
11121112

src/solvers/smt2/smt2_conv.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -561,10 +561,7 @@ void smt2_convt::convert_address_of_rec(
561561
new_index_expr,
562562
pointer_type(array.type().subtype()));
563563

564-
plus_exprt plus_expr(
565-
address_of_expr,
566-
index,
567-
address_of_expr.type());
564+
plus_exprt plus_expr{address_of_expr, index};
568565

569566
convert_expr(plus_expr);
570567
}

0 commit comments

Comments
 (0)