Simplify update_location_context

Eliminate update_sub_elements flag parameter as it would always be true.

Author: jezhiggins

src/analyses/variable-sensitivity/abstract_object.cpp

@@ -244,12 +244,11 @@ bool abstract_objectt::should_use_base_meet(
 abstract_object_pointert
 abstract_objectt::write_location_context(const locationt &location) const
 {
-  return update_location_context({location}, true);
+  return update_location_context({location});
 }
 
-abstract_object_pointert abstract_objectt::update_location_context(
-  const locationst &locations,
-  const bool update_sub_elements) const
+abstract_object_pointert
+abstract_objectt::update_location_context(const locationst &locations) const
 {
   return shared_from_this();
 }

src/analyses/variable-sensitivity/abstract_object.h

@@ -297,15 +297,12 @@ class abstract_objectt : public std::enable_shared_from_this<abstract_objectt>
    * propogating the update to any children of this abstract object.
    *
    * \param locations the set of locations to be updated
-   * \param update_sub_elements if true, propogate the update operation to any
-   * children of this abstract object
    *
    * \return a clone of this abstract object with it's location context
    * updated
    */
-  virtual abstract_object_pointert update_location_context(
-    const locationst &locations,
-    const bool update_sub_elements) const;
+  virtual abstract_object_pointert
+  update_location_context(const locationst &locations) const;
 
   // Const versions must perform copy-on-write
   abstract_object_pointert make_top() const

src/analyses/variable-sensitivity/context_abstract_object.cpp

@@ -106,18 +106,13 @@ abstract_object_pointert context_abstract_objectt::expression_transform(
 }
 
 abstract_object_pointert context_abstract_objectt::update_location_context(
-  const abstract_objectt::locationst &locations,
-  const bool update_sub_elements) const
+  const abstract_objectt::locationst &locations) const
 {
   auto result = update_location_context_internal(locations);
 
-  if(update_sub_elements)
-  {
-    abstract_object_pointert visited_child =
-      child_abstract_object->update_location_context(
-        locations, update_sub_elements);
-    result->set_child(visited_child);
-  }
+  abstract_object_pointert visited_child =
+    child_abstract_object->update_location_context(locations);
+  result->set_child(visited_child);
 
   return result;
 }

src/analyses/variable-sensitivity/context_abstract_object.h

@@ -81,9 +81,8 @@ class context_abstract_objectt : public abstract_objectt
     const abstract_environmentt &environment,
     const namespacet &ns) const override;
 
-  abstract_object_pointert update_location_context(
-    const abstract_objectt::locationst &locations,
-    const bool update_sub_elements) const override;
+  abstract_object_pointert
+  update_location_context(const locationst &locations) const override;
 
   void output(std::ostream &out, const class ai_baset &ai, const namespacet &ns)
     const override;

src/analyses/variable-sensitivity/full_array_abstract_object.cpp

@@ -378,12 +378,8 @@ abstract_object_pointert full_array_abstract_objectt::get_top_entry(
 }
 
 abstract_object_pointert full_array_abstract_objectt::update_location_context(
-  const locationst &locations,
-  const bool update_sub_elements) const
+  const locationst &locations) const
 {
-  if(!update_sub_elements)
-    return shared_from_this();
-
   return visit_sub_elements(location_update_visitort(locations));
 }
 

src/analyses/variable-sensitivity/full_array_abstract_object.h

@@ -65,15 +65,12 @@ class full_array_abstract_objectt : public abstract_aggregate_objectt<
    * propogating the update to any children of this abstract object.
    *
    * \param locations the set of locations to be updated
-   * \param update_sub_elements if true, propogate the update operation to any
-   * children of this abstract object
    *
    * \return a clone of this abstract object with it's location context
    * updated
    */
-  abstract_object_pointert update_location_context(
-    const locationst &locations,
-    const bool update_sub_elements) const override;
+  abstract_object_pointert
+  update_location_context(const locationst &locations) const override;
 
   /**
    * Apply a visitor operation to all sub elements of this abstract_object.

src/analyses/variable-sensitivity/full_struct_abstract_object.cpp

@@ -279,12 +279,8 @@ abstract_object_pointert full_struct_abstract_objectt::merge_constant_structs(
 }
 
 abstract_object_pointert full_struct_abstract_objectt::update_location_context(
-  const locationst &locations,
-  const bool update_sub_elements) const
+  const locationst &locations) const
 {
-  if(!update_sub_elements)
-    return shared_from_this();
-
   return visit_sub_elements(location_update_visitort(locations));
 }
 

src/analyses/variable-sensitivity/full_struct_abstract_object.h

@@ -71,15 +71,12 @@ class full_struct_abstract_objectt : public abstract_aggregate_objectt<
    * propogating the update to any children of this abstract object.
    *
    * \param locations the set of locations to be updated
-   * \param update_sub_elements if true, propogate the update operation to any
-   * children of this abstract object
    *
    * \return a clone of this abstract object with it's location context
    * updated
    */
-  abstract_object_pointert update_location_context(
-    const locationst &locations,
-    const bool update_sub_elements) const override;
+  abstract_object_pointert
+  update_location_context(const locationst &locations) const override;
 
   /**
    * Apply a visitor operation to all sub elements of this abstract_object.

src/analyses/variable-sensitivity/location_update_visitor.h

@@ -24,7 +24,7 @@ class location_update_visitort
   abstract_object_pointert
   visit(const abstract_object_pointert &element) const override
   {
-    return element->update_location_context(locations, true);
+    return element->update_location_context(locations);
   }
 
 private:

src/analyses/variable-sensitivity/write_location_context.cpp

@@ -175,8 +175,9 @@ write_location_contextt::abstract_object_merge_internal(
     // If the union is larger than the initial set, then update.
     if(location_union.size() > get_last_written_locations().size())
     {
-      abstract_object_pointert result = mutable_clone();
-      return result->update_location_context(location_union, false);
+      auto result =
+        std::dynamic_pointer_cast<write_location_contextt>(mutable_clone());
+      return result->update_location_context_internal(location_union);
     }
   }
   return shared_from_this();