Pass object factory to variable_sensitivity_dependence_graph

Author: jezhiggins

src/analyses/variable-sensitivity/variable_sensitivity_dependence_graph.cpp

@@ -610,31 +610,35 @@ class variable_sensitivity_dependence_domain_factoryt
 {
 public:
   explicit variable_sensitivity_dependence_domain_factoryt(
-    variable_sensitivity_dependence_grapht &_dg)
-    : dg(_dg)
+    variable_sensitivity_dependence_grapht &_dg,
+    variable_sensitivity_object_factory_ptrt _object_factory)
+    : dg(_dg),
+      object_factory(_object_factory)
   {
   }
 
   std::unique_ptr<statet> make(locationt l) const override
   {
     auto node_id = dg.add_node();
     dg.nodes[node_id].PC = l;
-    auto p = util_make_unique<variable_sensitivity_dependence_domaint>(node_id);
+    auto p = util_make_unique<variable_sensitivity_dependence_domaint>(node_id, object_factory);
     CHECK_RETURN(p->is_bottom());
 
     return std::unique_ptr<statet>(p.release());
   }
 
 private:
   variable_sensitivity_dependence_grapht &dg;
+  variable_sensitivity_object_factory_ptrt object_factory;
 };
 
 variable_sensitivity_dependence_grapht::variable_sensitivity_dependence_grapht(
   const goto_functionst &goto_functions,
-  const namespacet &_ns)
+  const namespacet &_ns,
+  variable_sensitivity_object_factory_ptrt _object_factory)
   : ai_three_way_merget(
       util_make_unique<ai_history_factory_default_constructort<ahistoricalt>>(),
-      util_make_unique<variable_sensitivity_dependence_domain_factoryt>(*this),
+      util_make_unique<variable_sensitivity_dependence_domain_factoryt>(*this, _object_factory),
       util_make_unique<location_sensitive_storaget>()),
     goto_functions(goto_functions),
     ns(_ns)

src/analyses/variable-sensitivity/variable_sensitivity_dependence_graph.h

@@ -74,8 +74,13 @@ class variable_sensitivity_dependence_domaint
 public:
   typedef grapht<vs_dep_nodet>::node_indext node_indext;
 
-  explicit variable_sensitivity_dependence_domaint(node_indext id)
-    : node_id(id), has_values(false), has_changed(false)
+  explicit variable_sensitivity_dependence_domaint(
+    node_indext id,
+    variable_sensitivity_object_factory_ptrt object_factory
+  ) : variable_sensitivity_domaint(object_factory),
+      node_id(id),
+      has_values(false),
+      has_changed(false)
   {
   }
 
@@ -237,7 +242,8 @@ class variable_sensitivity_dependence_grapht : public ai_three_way_merget,
 
   explicit variable_sensitivity_dependence_grapht(
     const goto_functionst &goto_functions,
-    const namespacet &_ns);
+    const namespacet &_ns,
+    variable_sensitivity_object_factory_ptrt object_factory);
 
   void
   initialize(const irep_idt &function_id, const goto_programt &goto_program)

src/goto-analyzer/goto_analyzer_parse_options.cpp

@@ -540,8 +540,12 @@ ai_baset *goto_analyzer_parse_optionst::build_analyzer(
     }
     else if(options.get_bool_option("dependence-graph-vs"))
     {
+      auto vsd_config = vsd_configt::from_options(options);
+      auto vs_object_factory =
+        std::make_shared<variable_sensitivity_object_factoryt>(vsd_config);
+
       return new variable_sensitivity_dependence_grapht(
-        goto_model.goto_functions, ns);
+        goto_model.goto_functions, ns, vs_object_factory);
     }
     else if(options.get_bool_option("vsd"))
     {