fixup! Apply L2 renaming in field_sensitivityt::apply

Author: romainbrenguier

src/goto-symex/field_sensitivity.cpp

@@ -94,30 +94,30 @@ exprt field_sensitivityt::apply(
       ssa_exprt tmp = to_ssa_expr(index.array());
       auto l2_index = state.rename(index.index(), ns);
       l2_index.simplify(ns);
-      auto l2_array = state.rename(index.array(), ns);
+      exprt l2_size = state.rename(
+        to_array_type(index.array().type()).size(), ns).get();
       bool was_l2 = !tmp.get_level_2().empty();
 
-      exprt array_size_expr = to_array_type(l2_array.get().type()).size();
-      if(array_size_expr.is_nil() && index.array().id() == ID_symbol)
+      if(l2_size.is_nil() && index.array().id() == ID_symbol)
       {
         // In case the array type was incomplete, attempt to retrieve it from
         // the symbol table.
         const symbolt *array_from_symbol_table = ns.get_symbol_table()
           .lookup(to_symbol_expr(index.array()).get_identifier());
         if(array_from_symbol_table != nullptr)
-          array_size_expr = to_array_type(array_from_symbol_table->type).size();
+          l2_size = to_array_type(array_from_symbol_table->type).size();
       }
 
       if(
-        array_size_expr.id() == ID_constant &&
-        numeric_cast_v<mp_integer>(to_constant_expr(array_size_expr))
+        l2_size.id() == ID_constant &&
+        numeric_cast_v<mp_integer>(to_constant_expr(l2_size))
           <= max_field_sensitive_array_size )
       {
         if(l2_index.get().id() == ID_constant)
         {
           // place the entire index expression, not just the array operand, in an
           // SSA expression
-          ssa_exprt ssa_array = to_ssa_expr(l2_array.get());
+          ssa_exprt ssa_array = to_ssa_expr(index.array());
           ssa_array.remove_level_2();
           index.array() = ssa_array.get_original_expr();
           index.index() = l2_index.get();
@@ -131,7 +131,7 @@ exprt field_sensitivityt::apply(
         {
           // Expand the array and return `{array[0]; array[1]; ...}[index]`
           exprt expanded_array =
-            get_fields(ns, state, to_ssa_expr(l2_array.get()));
+            get_fields(ns, state, to_ssa_expr(index.array()));
           return index_exprt{std::move(expanded_array), l2_index.get()};
         }
       }