Skip to content

remove index_type() #7992

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
Nov 2, 2023
Merged

remove index_type() #7992

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/goto-symex/shadow_memory_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ exprt compute_or_over_bytes(
for(mp_integer index = 0; index < size; ++index)
{
extract_bytes_of_expr(
index_exprt(expr, from_integer(index, index_type())),
index_exprt(expr, from_integer(index, array_type.index_type())),
field_type,
ns,
log,
Expand Down
8 changes: 4 additions & 4 deletions src/memory-analyzer/analyze_symbol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ exprt gdb_value_extractort::get_pointer_to_member_value(
struct_symbol_expr,
from_integer(
member_offset / get_type_size(to_pointer_type(expr.type()).base_type()),
index_type())};
c_index_type())};
}
if(struct_symbol->type.id() == ID_pointer)
{
Expand Down Expand Up @@ -406,7 +406,7 @@ exprt gdb_value_extractort::get_non_char_pointer_value(
for(size_t i = 0; i < number_of_elements; i++)
{
const auto sub_expr_value = get_expr_value(
dereference_exprt{plus_exprt{expr, from_integer(i, index_type())}},
dereference_exprt{plus_exprt{expr, from_integer(i, c_index_type())}},
*zero_expr,
location);
elements.push_back(sub_expr_value);
Expand All @@ -415,7 +415,7 @@ exprt gdb_value_extractort::get_non_char_pointer_value(

// knowing the number of elements we can build the type
const typet target_array_type =
array_typet{target_type, from_integer(elements.size(), index_type())};
array_typet{target_type, from_integer(elements.size(), c_index_type())};

array_exprt new_array{elements, to_array_type(target_array_type)};

Expand Down Expand Up @@ -591,7 +591,7 @@ exprt gdb_value_extractort::get_array_value(

for(size_t i = 0; i < new_array.operands().size(); ++i)
{
const index_exprt index_expr(expr, from_integer(i, index_type()));
const index_exprt index_expr(expr, from_integer(i, c_index_type()));

exprt &operand = new_array.operands()[i];

Expand Down
5 changes: 0 additions & 5 deletions src/util/c_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ bitvector_typet c_index_type()
return signed_size_type();
}

bitvector_typet index_type()
{
return c_index_type();
}

signedbv_typet signed_int_type()
{
signedbv_typet result(config.ansi_c.int_width);
Expand Down
4 changes: 0 additions & 4 deletions src/util/c_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,6 @@ inline code_with_contract_typet &to_code_with_contract_type(typet &type)
return static_cast<code_with_contract_typet &>(type);
}

DEPRECATED(
SINCE(2022, 1, 13, "use c_index_type() or array_typet::index_type() instead"))
bitvector_typet index_type();

bitvector_typet c_index_type();
signedbv_typet signed_int_type();
unsignedbv_typet unsigned_int_type();
Expand Down