Skip to content

Commit 6b5bdd6

Browse files
committed
remove index_type()
This removes index_type(), and the last remaining users. The function has been deprecated since January 2022.
1 parent eaa2cdd commit 6b5bdd6

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

src/goto-symex/shadow_memory_util.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ exprt compute_or_over_bytes(
475475
for(mp_integer index = 0; index < size; ++index)
476476
{
477477
extract_bytes_of_expr(
478-
index_exprt(expr, from_integer(index, index_type())),
478+
index_exprt(expr, from_integer(index, array_type.index_type())),
479479
field_type,
480480
ns,
481481
log,

src/memory-analyzer/analyze_symbol.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ exprt gdb_value_extractort::get_pointer_to_member_value(
313313
struct_symbol_expr,
314314
from_integer(
315315
member_offset / get_type_size(to_pointer_type(expr.type()).base_type()),
316-
index_type())};
316+
c_index_type())};
317317
}
318318
if(struct_symbol->type.id() == ID_pointer)
319319
{
@@ -406,7 +406,7 @@ exprt gdb_value_extractort::get_non_char_pointer_value(
406406
for(size_t i = 0; i < number_of_elements; i++)
407407
{
408408
const auto sub_expr_value = get_expr_value(
409-
dereference_exprt{plus_exprt{expr, from_integer(i, index_type())}},
409+
dereference_exprt{plus_exprt{expr, from_integer(i, c_index_type())}},
410410
*zero_expr,
411411
location);
412412
elements.push_back(sub_expr_value);
@@ -415,7 +415,7 @@ exprt gdb_value_extractort::get_non_char_pointer_value(
415415

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

420420
array_exprt new_array{elements, to_array_type(target_array_type)};
421421

@@ -591,7 +591,7 @@ exprt gdb_value_extractort::get_array_value(
591591

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

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

src/util/c_types.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ bitvector_typet c_index_type()
1919
return signed_size_type();
2020
}
2121

22-
bitvector_typet index_type()
23-
{
24-
return c_index_type();
25-
}
26-
2722
signedbv_typet signed_int_type()
2823
{
2924
signedbv_typet result(config.ansi_c.int_width);

src/util/c_types.h

-4
Original file line numberDiff line numberDiff line change
@@ -479,10 +479,6 @@ inline code_with_contract_typet &to_code_with_contract_type(typet &type)
479479
return static_cast<code_with_contract_typet &>(type);
480480
}
481481

482-
DEPRECATED(
483-
SINCE(2022, 1, 13, "use c_index_type() or array_typet::index_type() instead"))
484-
bitvector_typet index_type();
485-
486482
bitvector_typet c_index_type();
487483
signedbv_typet signed_int_type();
488484
unsignedbv_typet unsigned_int_type();

0 commit comments

Comments
 (0)