Export configuration on object factory, and on abstract_environmentt

Author: jezhiggins

src/analyses/variable-sensitivity/abstract_environment.cpp

@@ -337,10 +337,9 @@ abstract_object_pointert abstract_environmentt::abstract_object_factory(
     type, top, bttm, e, environment, ns);
 }
 
-abstract_object_pointert abstract_environmentt::add_object_context(
-  const abstract_object_pointert &abstract_object) const
+const vsd_configt &abstract_environmentt::configuration() const
 {
-  return object_factory->wrap_with_context(abstract_object);
+  return object_factory->config();
 }
 
 bool abstract_environmentt::merge(

src/analyses/variable-sensitivity/abstract_environment.h

@@ -35,6 +35,8 @@ enum class widen_modet
   could_widen
 };
 
+struct vsd_configt;
+
 class abstract_environmentt
 {
 public:
@@ -174,18 +176,8 @@ class abstract_environmentt
     const exprt &e,
     const namespacet &ns) const;
 
-  /// Wraps an existing object in any configured context object
-  ///
-  /// \param abstract_object: The object to be wrapped
-  ///
-  /// \return The wrapped abstract object
-  ///
-  /// Look at the configuration context dependency, and constructs
-  /// the appropriate wrapper object around the supplied object
-  /// If no such configuration is enabled, the supplied object will be
-  /// returned unchanged
-  virtual abstract_object_pointert
-  add_object_context(const abstract_object_pointert &abstract_object) const;
+  /// Exposes the environment configuration
+  const vsd_configt &configuration() const;
 
   /// Computes the join between "this" and "b"
   ///

src/analyses/variable-sensitivity/variable_sensitivity_object_factory.h

@@ -77,6 +77,11 @@ class variable_sensitivity_object_factoryt
   variable_sensitivity_object_factoryt(
     const variable_sensitivity_object_factoryt &) = delete;
 
+  const vsd_configt &config() const
+  {
+    return configuration;
+  }
+
 private:
   /// Decide which abstract object type to use for the variable in question.
   ///