Skip to content

Commit e695bbe

Browse files
committed
array_abstract_objectt::write_index returns abstract_object_pointert
Was returning a shared_ptr<const array_abstract_objectt>, but write_index is only called from write, which returns an abstract_object_pointert so returning the more specialised shared pointer was redundant. This change will also allow the write_index implementation to be simplified.
1 parent 93398ca commit e695bbe

8 files changed

+10
-10
lines changed

src/analyses/variable-sensitivity/array_abstract_object.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ abstract_object_pointert array_abstract_objectt::read_index(
6868
return env.abstract_object_factory(subtype, ns, !is_bottom(), is_bottom());
6969
}
7070

71-
sharing_ptrt<array_abstract_objectt> array_abstract_objectt::write_index(
71+
abstract_object_pointert array_abstract_objectt::write_index(
7272
abstract_environmentt &environment,
7373
const namespacet &ns,
7474
const std::stack<exprt> stack,

src/analyses/variable-sensitivity/array_abstract_object.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ class array_abstract_objectt : public abstract_objectt
117117
/// \param value: the value we are trying to assign to that value in the array
118118
/// \param merging_write: ?
119119
///
120-
/// \return The array_abstract_objectt representing the result of writing
120+
/// \return The abstract_object_pointert representing the result of writing
121121
/// to a specific component. In this case this will always be top
122122
/// as we are not tracking the value in the array.
123-
virtual sharing_ptrt<array_abstract_objectt> write_index(
123+
virtual abstract_object_pointert write_index(
124124
abstract_environmentt &environment,
125125
const namespacet &ns,
126126
const std::stack<exprt> stack,

src/analyses/variable-sensitivity/constant_array_abstract_object.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ abstract_object_pointert constant_array_abstract_objectt::read_index(
189189
}
190190
}
191191

192-
sharing_ptrt<array_abstract_objectt>
192+
abstract_object_pointert
193193
constant_array_abstract_objectt::write_index(
194194
abstract_environmentt &environment,
195195
const namespacet &ns,

src/analyses/variable-sensitivity/constant_array_abstract_object.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ class constant_array_abstract_objectt : public array_abstract_objectt
110110
/// \param value: the value we are trying to assign to that value in the array
111111
/// \param merging_write: Should this and all future writes be merged with the
112112
/// current value
113-
/// \return The array_abstract_objectt representing the result of writing
113+
/// \return The abstract_object_pointert representing the result of writing
114114
/// to a specific index.
115-
sharing_ptrt<array_abstract_objectt> write_index(
115+
abstract_object_pointert write_index(
116116
abstract_environmentt &environment,
117117
const namespacet &ns,
118118
const std::stack<exprt> stack,

src/analyses/variable-sensitivity/interval_array_abstract_object.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static constant_interval_exprt eval_and_get_as_interval(
4747
return evaluated_index_interval->get_interval();
4848
}
4949

50-
sharing_ptrt<array_abstract_objectt>
50+
abstract_object_pointert
5151
interval_array_abstract_objectt::write_index(
5252
abstract_environmentt &environment,
5353
const namespacet &ns,

src/analyses/variable-sensitivity/interval_array_abstract_object.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class interval_array_abstract_objectt : public constant_array_abstract_objectt
3232
const index_exprt &index,
3333
const namespacet &ns) const override;
3434

35-
sharing_ptrt<array_abstract_objectt> write_index(
35+
abstract_object_pointert write_index(
3636
abstract_environmentt &environment,
3737
const namespacet &ns,
3838
const std::stack<exprt> stack,

src/analyses/variable-sensitivity/value_set_array_abstract_object.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ abstract_object_pointert value_set_array_abstract_objectt::read_index(
4242
return array_abstract_objectt::read_index(env, index, ns);
4343
}
4444

45-
sharing_ptrt<array_abstract_objectt>
45+
abstract_object_pointert
4646
value_set_array_abstract_objectt::write_index(
4747
abstract_environmentt &environment,
4848
const namespacet &ns,

src/analyses/variable-sensitivity/value_set_array_abstract_object.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class value_set_array_abstract_objectt : public array_abstract_objectt
4141
const index_exprt &index,
4242
const namespacet &ns) const override;
4343

44-
sharing_ptrt<array_abstract_objectt> write_index(
44+
abstract_object_pointert write_index(
4545
abstract_environmentt &environment,
4646
const namespacet &ns,
4747
std::stack<exprt> stack,

0 commit comments

Comments
 (0)