Merge pull request #7992 from diffblue/remove_index_type

remove index_type()

Author: tautschnig

src/goto-symex/shadow_memory_util.cpp

@@ -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,

src/memory-analyzer/analyze_symbol.cpp

@@ -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)
   {
@@ -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);
@@ -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)};
 
@@ -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];
 

src/util/c_types.cpp

@@ -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);

src/util/c_types.h

@@ -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();