Skip to content

Commit c96e02a

Browse files
author
Daniel Kroening
committed
no longer use deprecated constructors for some bitvector types
1 parent 933d635 commit c96e02a

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

src/ansi-c/padding.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ void add_padding(struct_typet &type, const namespacet &ns)
225225
{
226226
mp_integer pad=a-displacement;
227227

228-
unsignedbv_typet padding_type;
229-
padding_type.set_width(integer2unsigned(pad*8));
228+
std::size_t width=integer2size_t(pad*8);
229+
unsignedbv_typet padding_type(width);
230230

231231
struct_typet::componentt component;
232232
component.type()=padding_type;
@@ -282,8 +282,8 @@ void add_padding(struct_typet &type, const namespacet &ns)
282282
{
283283
mp_integer pad=max_alignment-displacement;
284284

285-
unsignedbv_typet padding_type;
286-
padding_type.set_width(integer2unsigned(pad*8));
285+
std::size_t width=integer2size_t(pad*8);
286+
unsignedbv_typet padding_type(width);
287287

288288
// we insert after any final 'flexible member'
289289
struct_typet::componentt component;
@@ -324,8 +324,8 @@ void add_padding(union_typet &type, const namespacet &ns)
324324
mp_integer padding_bits=
325325
max_alignment_bits-(size_bits%max_alignment_bits);
326326

327-
unsignedbv_typet padding_type;
328-
padding_type.set_width(integer2size_t(size_bits+padding_bits));
327+
unsignedbv_typet padding_type(
328+
integer2size_t(size_bits+padding_bits));
329329

330330
struct_typet::componentt component;
331331
component.type()=padding_type;

src/solvers/flattening/boolbv_extractbit.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ literalt boolbvt::convert_extractbit(const extractbit_exprt &expr)
5555
mp_integer index_width=
5656
std::max(address_bits(width_op0), mp_integer(width_op1));
5757

58-
unsignedbv_typet index_type;
59-
index_type.set_width(integer2unsigned(index_width));
58+
unsignedbv_typet index_type(integer2size_t(index_width));
6059

6160
equal_exprt equality;
6261
equality.lhs()=operands[1]; // index operand

src/solvers/smt1/smt1_conv.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,7 @@ exprt smt1_convt::ce_value(
234234

235235
typet smt1_convt::array_index_type() const
236236
{
237-
signedbv_typet t;
238-
t.set_width(array_index_bits);
239-
return t;
237+
return signedbv_typet(array_index_bits);
240238
}
241239

242240
void smt1_convt::array_index(const exprt &expr)

src/solvers/smt2/smt2_conv.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -550,8 +550,7 @@ void smt2_convt::convert_address_of_rec(
550550
mp_integer offset=member_offset(struct_type, component_name, ns);
551551
assert(offset>=0);
552552

553-
unsignedbv_typet index_type;
554-
index_type.set_width(boolbv_width(result_type));
553+
unsignedbv_typet index_type(boolbv_width(result_type));
555554

556555
// pointer arithmetic
557556
out << "(bvadd ";

0 commit comments

Comments
 (0)