Strip out unnecessary casts when calling unwrap_context()

Author: jezhiggins

src/analyses/variable-sensitivity/abstract_environment.cpp

@@ -520,12 +520,8 @@ std::vector<abstract_object_pointert> eval_operands(
 ///////////
 abstract_value_pointert as_value(const abstract_object_pointert &obj)
 {
-  auto context_value =
-    std::dynamic_pointer_cast<const context_abstract_objectt>(obj);
-
-  return context_value
-           ? as_value(context_value->unwrap_context())
-           : std::dynamic_pointer_cast<const abstract_value_objectt>(obj);
+  return std::dynamic_pointer_cast<const abstract_value_objectt>(
+    obj->unwrap_context());
 }
 
 bool is_value(const abstract_object_pointert &obj)

src/analyses/variable-sensitivity/value_set_abstract_object.cpp

@@ -250,10 +250,6 @@ abstract_object_pointert value_set_abstract_objectt::resolve_values(
     return std::make_shared<interval_abstract_valuet>(
       unwrapped_values.to_interval());
   }
-  //if(unwrapped_values.size() == 1)
-  //{
-  //  return (*unwrapped_values.begin());
-  //}
 
   auto result =
     std::dynamic_pointer_cast<value_set_abstract_objectt>(mutable_clone());
@@ -307,23 +303,13 @@ void value_set_abstract_objectt::output(
   }
 }
 
-static abstract_object_pointert
-maybe_unwrap_context(const abstract_object_pointert &maybe_wrapped)
-{
-  auto const &context_value =
-    std::dynamic_pointer_cast<const context_abstract_objectt>(maybe_wrapped);
-
-  return context_value ? context_value->unwrap_context() : maybe_wrapped;
-}
-
 static abstract_object_sett
 unwrap_and_extract_values(const abstract_object_sett &values)
 {
   abstract_object_sett unwrapped_values;
   for(auto const &value : values)
   {
-    unwrapped_values.insert(
-      maybe_extract_single_value(maybe_unwrap_context(value)));
+    unwrapped_values.insert(maybe_extract_single_value(value));
   }
 
   return unwrapped_values;
@@ -332,8 +318,8 @@ unwrap_and_extract_values(const abstract_object_sett &values)
 static abstract_object_pointert
 maybe_extract_single_value(const abstract_object_pointert &maybe_singleton)
 {
-  auto const &value_as_set =
-    std::dynamic_pointer_cast<const value_set_tag>(maybe_singleton);
+  auto const &value_as_set = std::dynamic_pointer_cast<const value_set_tag>(
+    maybe_singleton->unwrap_context());
   if(value_as_set)
   {
     PRECONDITION(value_as_set->get_values().size() == 1);

src/analyses/variable-sensitivity/value_set_pointer_abstract_object.cpp

@@ -23,13 +23,6 @@ unwrap_and_extract_values(const abstract_object_sett &values);
 static abstract_object_pointert
 maybe_extract_single_value(const abstract_object_pointert &maybe_singleton);
 
-/// Helper for converting context objects into its abstract-value children
-/// \p maybe_wrapped: either an abstract value (or a set of those) or one
-///   wrapped in a context
-/// \return an abstract value without context (though it might be as set)
-static abstract_object_pointert
-maybe_unwrap_context(const abstract_object_pointert &maybe_wrapped);
-
 /// Recursively construct a combination \p sub_con from \p super_con and once
 ///   constructed call \p f.
 /// \param super_con: vector of some containers storing the values
@@ -215,8 +208,7 @@ unwrap_and_extract_values(const abstract_object_sett &values)
   abstract_object_sett unwrapped_values;
   for(auto const &value : values)
   {
-    unwrapped_values.insert(
-      maybe_extract_single_value(maybe_unwrap_context(value)));
+    unwrapped_values.insert(maybe_extract_single_value(value));
   }
 
   return unwrapped_values;
@@ -225,8 +217,8 @@ unwrap_and_extract_values(const abstract_object_sett &values)
 abstract_object_pointert
 maybe_extract_single_value(const abstract_object_pointert &maybe_singleton)
 {
-  auto const &value_as_set =
-    std::dynamic_pointer_cast<const value_set_tag>(maybe_singleton);
+  auto const &value_as_set = std::dynamic_pointer_cast<const value_set_tag>(
+    maybe_singleton->unwrap_context());
   if(value_as_set)
   {
     PRECONDITION(value_as_set->get_values().size() == 1);
@@ -238,12 +230,3 @@ maybe_extract_single_value(const abstract_object_pointert &maybe_singleton)
   else
     return maybe_singleton;
 }
-
-abstract_object_pointert
-maybe_unwrap_context(const abstract_object_pointert &maybe_wrapped)
-{
-  auto const &context_value =
-    std::dynamic_pointer_cast<const context_abstract_objectt>(maybe_wrapped);
-
-  return context_value ? context_value->unwrap_context() : maybe_wrapped;
-}

unit/analyses/variable-sensitivity/eval-member-access.cpp

@@ -110,8 +110,8 @@ exprt fetch_element(
   if(object->is_top()) // oh!
     return object->to_constant();
 
-  const auto unwrapped = object->unwrap_context();
-  auto value = std::dynamic_pointer_cast<const abstract_objectt>(unwrapped);
+  auto value =
+    std::dynamic_pointer_cast<const abstract_objectt>(object->unwrap_context());
   REQUIRE(value);
   return value->to_constant();
 }

unit/analyses/variable-sensitivity/eval.cpp

@@ -50,11 +50,9 @@ SCENARIO(
           std::dynamic_pointer_cast<const context_abstract_objectt>(result));
         REQUIRE_FALSE(result->is_top());
         REQUIRE_FALSE(result->is_bottom());
-        const auto unwrapped =
-          std::dynamic_pointer_cast<const context_abstract_objectt>(result)
-            ->unwrap_context();
         auto result_as_interval =
-          std::dynamic_pointer_cast<const interval_abstract_valuet>(unwrapped);
+          std::dynamic_pointer_cast<const interval_abstract_valuet>(
+            result->unwrap_context());
         REQUIRE(result_as_interval);
         REQUIRE(
           result_as_interval->to_interval().get_lower() ==