Stripped down value_set_abstract_objectt::resolve_values

No longer convert large value sets into an interval.

Author: jezhiggins

src/analyses/variable-sensitivity/value_set_abstract_object.cpp

@@ -139,6 +139,15 @@ value_set_abstract_objectt::value_set_abstract_objectt(
   verify();
 }
 
+value_set_abstract_objectt::value_set_abstract_objectt(
+  const typet &type,
+  abstract_object_sett initial_values)
+  : abstract_value_objectt(type, false, false),
+    values(std::move(initial_values))
+{
+  verify();
+}
+
 index_range_implementation_ptrt
 value_set_abstract_objectt::index_range_implementation(
   const namespacet &ns) const
@@ -245,16 +254,7 @@ abstract_object_pointert value_set_abstract_objectt::resolve_values(
 
   auto unwrapped_values = unwrap_and_extract_values(new_values);
 
-  if(unwrapped_values.size() > max_value_set_size)
-  {
-    return std::make_shared<interval_abstract_valuet>(
-      unwrapped_values.to_interval());
-  }
-
-  auto result =
-    std::dynamic_pointer_cast<value_set_abstract_objectt>(mutable_clone());
-  result->set_values(unwrapped_values);
-  return result;
+  return std::make_shared<value_set_abstract_objectt>(type(), unwrapped_values);
 }
 
 void value_set_abstract_objectt::set_top_internal()

src/analyses/variable-sensitivity/value_set_abstract_object.h

@@ -30,6 +30,10 @@ class value_set_abstract_objectt : public abstract_value_objectt,
     const abstract_environmentt &environment,
     const namespacet &ns);
 
+  value_set_abstract_objectt(
+    const typet &type,
+    abstract_object_sett initial_values);
+
   index_range_implementation_ptrt
   index_range_implementation(const namespacet &ns) const override;