Skip to content

SMT2: allow natural-typed shift distance #8519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2024
Merged

SMT2: allow natural-typed shift distance #8519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/solvers/smt2/smt2_conv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,7 +1586,8 @@ void smt2_convt::convert_expr(const exprt &expr)
// SMT2 requires the shift distance to have the same width as
// the value that is shifted -- odd!

if(shift_expr.distance().type().id() == ID_integer)
const auto &distance_type = shift_expr.distance().type();
if(distance_type.id() == ID_integer || distance_type.id() == ID_natural)
{
const mp_integer i =
numeric_cast_v<mp_integer>(to_constant_expr(shift_expr.distance()));
Expand All @@ -1597,13 +1598,12 @@ void smt2_convt::convert_expr(const exprt &expr)
convert_expr(tmp);
}
else if(
shift_expr.distance().type().id() == ID_signedbv ||
shift_expr.distance().type().id() == ID_unsignedbv ||
shift_expr.distance().type().id() == ID_c_enum ||
shift_expr.distance().type().id() == ID_c_bool)
distance_type.id() == ID_signedbv ||
distance_type.id() == ID_unsignedbv ||
distance_type.id() == ID_c_enum || distance_type.id() == ID_c_bool)
{
std::size_t width_op0 = boolbv_width(shift_expr.op().type());
std::size_t width_op1 = boolbv_width(shift_expr.distance().type());
std::size_t width_op1 = boolbv_width(distance_type);

if(width_op0==width_op1)
convert_expr(shift_expr.distance());
Expand All @@ -1621,9 +1621,11 @@ void smt2_convt::convert_expr(const exprt &expr)
}
}
else
{
UNEXPECTEDCASE(
"unsupported distance type for " + shift_expr.id_string() + ": " +
type.id_string());
distance_type.id_string());
}

out << ")"; // bv*sh
}
Expand Down
Loading