Skip to content

Commit 3302184

Browse files
committed
Remove pointert default constructor
This constructor catered the risk of dealing with uninitialised object/offset pairs.
1 parent 6672791 commit 3302184

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

src/cprover/bv_pointers_wide.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -788,10 +788,9 @@ exprt bv_pointers_widet::bv_get_rec(
788788

789789
constant_exprt result(bvrep, type);
790790

791-
pointer_logict::pointert pointer;
792-
pointer.object =
793-
numeric_cast_v<std::size_t>(binary2integer(value_addr, false));
794-
pointer.offset = binary2integer(value_offset, true);
791+
pointer_logict::pointert pointer{
792+
numeric_cast_v<std::size_t>(binary2integer(value_addr, false)),
793+
binary2integer(value_offset, true)};
795794

796795
return annotated_pointer_constant_exprt{
797796
bvrep, pointer_logic.pointer_expr(pointer, pt)};

src/solvers/flattening/bv_pointers.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -795,10 +795,9 @@ exprt bv_pointerst::bv_get_rec(
795795

796796
constant_exprt result(bvrep, type);
797797

798-
pointer_logict::pointert pointer;
799-
pointer.object =
800-
numeric_cast_v<std::size_t>(binary2integer(value_addr, false));
801-
pointer.offset=binary2integer(value_offset, true);
798+
pointer_logict::pointert pointer{
799+
numeric_cast_v<std::size_t>(binary2integer(value_addr, false)),
800+
binary2integer(value_offset, true)};
802801

803802
return annotated_pointer_constant_exprt{
804803
bvrep, pointer_logic.pointer_expr(pointer, pt)};

src/solvers/flattening/pointer_logic.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ class pointer_logict
2929
{
3030
mp_integer object, offset;
3131

32-
pointert()
33-
{
34-
}
35-
3632
pointert(mp_integer _obj, mp_integer _off)
3733
: object(std::move(_obj)), offset(std::move(_off))
3834
{

src/solvers/smt2/smt2_conv.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,9 +659,7 @@ exprt smt2_convt::parse_rec(const irept &src, const typet &type)
659659

660660
// split into object and offset
661661
mp_integer pow=power(2, width-config.bv_encoding.object_bits);
662-
pointer_logict::pointert ptr;
663-
ptr.object = numeric_cast_v<std::size_t>(v / pow);
664-
ptr.offset=v%pow;
662+
pointer_logict::pointert ptr{numeric_cast_v<std::size_t>(v / pow), v % pow};
665663
return annotated_pointer_constant_exprt(
666664
bv_expr.get_value(),
667665
pointer_logic.pointer_expr(ptr, to_pointer_type(type)));

0 commit comments

Comments
 (0)