Skip to content

SMT2: only typecast array index for fixed-width bitvector index types #9073

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

Open
tautschnig wants to merge 1 commit into
base: develop
Choose a base branch
from
+32 −3
Open

SMT2: only typecast array index for fixed-width bitvector index types #9073

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
35 changes: 32 additions & 3 deletions src/solvers/smt2/smt2_conv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4552,10 +4552,23 @@ void smt2_convt::convert_with(const with_exprt &expr)

if(use_array_theory(expr))
{
const typet idx_type = array_type.index_type();
const auto is_bv = [](const typet &t)
{
return t.id() == ID_unsignedbv || t.id() == ID_signedbv ||
t.id() == ID_c_bool || t.id() == ID_c_enum ||
t.id() == ID_c_enum_tag;
};
const exprt where =
(idx_type != expr.where().type() && is_bv(idx_type) &&
is_bv(expr.where().type()))
? static_cast<exprt>(typecast_exprt(expr.where(), idx_type))
: expr.where();
Comment on lines +4555 to +4566

out << "(store ";
convert_expr(expr.old());
out << " ";
convert_expr(typecast_exprt(expr.where(), array_type.index_type()));
convert_expr(where);
out << " ";
convert_expr(expr.new_value());
out << ")";
Expand Down Expand Up @@ -4768,13 +4781,29 @@ void smt2_convt::convert_index(const index_exprt &expr)

if(use_array_theory(expr.array()))
{
// Typecast the index to the array's index type, but only when both
// types are fixed-width bitvectors. For mathematical integers or
// struct-typed indices (e.g., map keys), emit directly.
const typet idx_type = array_type.index_type();
Comment on lines +4784 to +4787
const auto is_bv = [](const typet &t)
{
return t.id() == ID_unsignedbv || t.id() == ID_signedbv ||
t.id() == ID_c_bool || t.id() == ID_c_enum ||
t.id() == ID_c_enum_tag;
};
const exprt index =
(idx_type != expr.index().type() && is_bv(idx_type) &&
is_bv(expr.index().type()))
? static_cast<exprt>(typecast_exprt(expr.index(), idx_type))
: expr.index();
Comment on lines +4787 to +4798
Comment on lines +4794 to +4798

if(expr.is_boolean() && !use_array_of_bool)
{
out << "(= ";
out << "(select ";
convert_expr(expr.array());
out << " ";
convert_expr(typecast_exprt(expr.index(), array_type.index_type()));
convert_expr(index);
out << ")";
out << " #b1)";
}
Expand All @@ -4783,7 +4812,7 @@ void smt2_convt::convert_index(const index_exprt &expr)
out << "(select ";
convert_expr(expr.array());
out << " ";
convert_expr(typecast_exprt(expr.index(), array_type.index_type()));
convert_expr(index);
out << ")";
}
}
Expand Down
Loading