Update subclasses of ai_domain_baset to deprecate function

martin · martin · commit b9d0fa903777 · 2020-11-17T17:17:57.000Z
transform's signature changed during the addition of
ai_historyt.  This is removing the old signature in favour
of the newer, more flexible one.
diff --git a/src/analyses/ai_domain.h b/src/analyses/ai_domain.h
@@ -103,24 +103,6 @@ class ai_domain_baset
     const irep_idt &function_to,
     trace_ptrt to,
     ai_baset &ai,
-    const namespacet &ns)
-  {
-    return transform(
-      function_from,
-      from->current_location(),
-      function_to,
-      to->current_location(),
-      ai,
-      ns);
-  }
-
-  DEPRECATED(SINCE(2019, 08, 01, "use the history signature instead"))
-  virtual void transform(
-    const irep_idt &function_from,
-    locationt from,
-    const irep_idt &function_to,
-    locationt to,
-    ai_baset &ai,
     const namespacet &ns) = 0;
 
   virtual void
diff --git a/src/analyses/constant_propagator.cpp b/src/analyses/constant_propagator.cpp
@@ -122,12 +122,15 @@ void constant_propagator_domaint::assign_rec(
 
 void constant_propagator_domaint::transform(
   const irep_idt &function_from,
-  locationt from,
+  trace_ptrt trace_from,
   const irep_idt &function_to,
-  locationt to,
+  trace_ptrt trace_to,
   ai_baset &ai,
   const namespacet &ns)
 {
+  locationt from{trace_from->current_location()};
+  locationt to{trace_to->current_location()};
+
 #ifdef DEBUG
   std::cout << "Transform from/to:\n";
   std::cout << from->location_number << " --> "
diff --git a/src/analyses/constant_propagator.h b/src/analyses/constant_propagator.h
@@ -35,9 +35,9 @@ class constant_propagator_domaint:public ai_domain_baset
 public:
   virtual void transform(
     const irep_idt &function_from,
-    locationt from,
+    trace_ptrt trace_from,
     const irep_idt &function_to,
-    locationt to,
+    trace_ptrt trace_to,
     ai_baset &ai_base,
     const namespacet &ns) final override;
 
diff --git a/src/analyses/custom_bitvector_analysis.cpp b/src/analyses/custom_bitvector_analysis.cpp
@@ -267,12 +267,15 @@ void custom_bitvector_domaint::assign_struct_rec(
 
 void custom_bitvector_domaint::transform(
   const irep_idt &function_from,
-  locationt from,
+  trace_ptrt trace_from,
   const irep_idt &function_to,
-  locationt to,
+  trace_ptrt trace_to,
   ai_baset &ai,
   const namespacet &ns)
 {
+  locationt from{trace_from->current_location()};
+  locationt to{trace_to->current_location()};
+
   // upcast of ai
   custom_bitvector_analysist &cba=
     static_cast<custom_bitvector_analysist &>(ai);
diff --git a/src/analyses/custom_bitvector_analysis.h b/src/analyses/custom_bitvector_analysis.h
@@ -25,9 +25,9 @@ class custom_bitvector_domaint:public ai_domain_baset
 public:
   void transform(
     const irep_idt &function_from,
-    locationt from,
+    trace_ptrt trace_from,
     const irep_idt &function_to,
-    locationt to,
+    trace_ptrt trace_to,
     ai_baset &ai,
     const namespacet &ns) final override;
 
diff --git a/src/analyses/dependence_graph.cpp b/src/analyses/dependence_graph.cpp
@@ -194,12 +194,15 @@ void dep_graph_domaint::data_dependencies(
 
 void dep_graph_domaint::transform(
   const irep_idt &function_from,
-  goto_programt::const_targett from,
+  trace_ptrt trace_from,
   const irep_idt &function_to,
-  goto_programt::const_targett to,
+  trace_ptrt trace_to,
   ai_baset &ai,
   const namespacet &ns)
 {
+  locationt from{trace_from->current_location()};
+  locationt to{trace_to->current_location()};
+
   dependence_grapht *dep_graph=dynamic_cast<dependence_grapht*>(&ai);
   assert(dep_graph!=nullptr);
 
diff --git a/src/analyses/dependence_graph.h b/src/analyses/dependence_graph.h
@@ -80,9 +80,9 @@ class dep_graph_domaint:public ai_domain_baset
 
   void transform(
     const irep_idt &function_from,
-    goto_programt::const_targett from,
+    trace_ptrt trace_from,
     const irep_idt &function_to,
-    goto_programt::const_targett to,
+    trace_ptrt trace_to,
     ai_baset &ai,
     const namespacet &ns) final override;
 
diff --git a/src/analyses/escape_analysis.cpp b/src/analyses/escape_analysis.cpp
@@ -166,13 +166,15 @@ void escape_domaint::get_rhs_aliases_address_of(
 }
 
 void escape_domaint::transform(
-  const irep_idt &,
-  locationt from,
-  const irep_idt &,
-  locationt,
-  ai_baset &,
-  const namespacet &)
+  const irep_idt &function_from,
+  trace_ptrt trace_from,
+  const irep_idt &function_to,
+  trace_ptrt trace_to,
+  ai_baset &ai,
+  const namespacet &ns)
 {
+  locationt from{trace_from->current_location()};
+
   if(has_values.is_false())
     return;
 
diff --git a/src/analyses/escape_analysis.h b/src/analyses/escape_analysis.h
@@ -30,9 +30,9 @@ class escape_domaint:public ai_domain_baset
 
   void transform(
     const irep_idt &function_from,
-    locationt from,
+    trace_ptrt trace_from,
     const irep_idt &function_to,
-    locationt to,
+    trace_ptrt trace_to,
     ai_baset &ai,
     const namespacet &ns) final override;
 
diff --git a/src/analyses/global_may_alias.cpp b/src/analyses/global_may_alias.cpp
@@ -91,13 +91,15 @@ void global_may_alias_domaint::get_rhs_aliases_address_of(
 }
 
 void global_may_alias_domaint::transform(
-  const irep_idt &,
-  locationt from,
-  const irep_idt &,
-  locationt,
-  ai_baset &,
-  const namespacet &)
+  const irep_idt &function_from,
+  trace_ptrt trace_from,
+  const irep_idt &function_to,
+  trace_ptrt trace_to,
+  ai_baset &ai,
+  const namespacet &ns)
 {
+  locationt from{trace_from->current_location()};
+
   if(has_values.is_false())
     return;
 
diff --git a/src/analyses/global_may_alias.h b/src/analyses/global_may_alias.h
@@ -31,9 +31,9 @@ class global_may_alias_domaint:public ai_domain_baset
   /// Abstract Interpretation domain transform function.
   void transform(
     const irep_idt &function_from,
-    locationt from,
+    trace_ptrt trace_from,
     const irep_idt &function_to,
-    locationt to,
+    trace_ptrt trace_to,
     ai_baset &ai,
     const namespacet &ns) final override;
 
diff --git a/src/analyses/interval_domain.cpp b/src/analyses/interval_domain.cpp
@@ -57,13 +57,16 @@ void interval_domaint::output(
 }
 
 void interval_domaint::transform(
-  const irep_idt &,
-  locationt from,
-  const irep_idt &,
-  locationt to,
-  ai_baset &,
+  const irep_idt &function_from,
+  trace_ptrt trace_from,
+  const irep_idt &function_to,
+  trace_ptrt trace_to,
+  ai_baset &ai,
   const namespacet &ns)
 {
+  locationt from{trace_from->current_location()};
+  locationt to{trace_to->current_location()};
+
   const goto_programt::instructiont &instruction=*from;
   switch(instruction.type)
   {
diff --git a/src/analyses/interval_domain.h b/src/analyses/interval_domain.h
@@ -33,9 +33,9 @@ class interval_domaint:public ai_domain_baset
 
   void transform(
     const irep_idt &function_from,
-    locationt from,
+    trace_ptrt trace_from,
     const irep_idt &function_to,
-    locationt to,
+    trace_ptrt trace_to,
     ai_baset &ai,
     const namespacet &ns) final override;
 
diff --git a/src/analyses/invariant_set_domain.cpp b/src/analyses/invariant_set_domain.cpp
@@ -15,13 +15,16 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/simplify_expr.h>
 
 void invariant_set_domaint::transform(
-  const irep_idt &,
-  locationt from_l,
-  const irep_idt &,
-  locationt to_l,
-  ai_baset &,
+  const irep_idt &function_from,
+  trace_ptrt trace_from,
+  const irep_idt &function_to,
+  trace_ptrt trace_to,
+  ai_baset &ai,
   const namespacet &ns)
 {
+  locationt from_l(trace_from->current_location());
+  locationt to_l(trace_to->current_location());
+
   switch(from_l->type)
   {
   case GOTO:
diff --git a/src/analyses/invariant_set_domain.h b/src/analyses/invariant_set_domain.h
@@ -58,9 +58,9 @@ class invariant_set_domaint:public ai_domain_baset
 
   virtual void transform(
     const irep_idt &function_from,
-    locationt from_l,
+    trace_ptrt trace_from,
     const irep_idt &function_to,
-    locationt to_l,
+    trace_ptrt trace_to,
     ai_baset &ai,
     const namespacet &ns) final override;
 
diff --git a/src/analyses/is_threaded.cpp b/src/analyses/is_threaded.cpp
@@ -48,12 +48,14 @@ class is_threaded_domaint:public ai_domain_baset
 
   void transform(
     const irep_idt &,
-    locationt from,
+    trace_ptrt trace_from,
     const irep_idt &,
-    locationt,
+    trace_ptrt,
     ai_baset &,
-    const namespacet &) final override
+    const namespacet &) override
   {
+    locationt from{trace_from->current_location()};
+
     INVARIANT(reachable,
               "Transformers are only applied at reachable locations");
 
diff --git a/src/analyses/reaching_definitions.cpp b/src/analyses/reaching_definitions.cpp
@@ -90,12 +90,15 @@ void rd_range_domaint::populate_cache(const irep_idt &identifier) const
 
 void rd_range_domaint::transform(
   const irep_idt &function_from,
-  locationt from,
+  trace_ptrt trace_from,
   const irep_idt &function_to,
-  locationt to,
+  trace_ptrt trace_to,
   ai_baset &ai,
   const namespacet &ns)
 {
+  locationt from{trace_from->current_location()};
+  locationt to{trace_to->current_location()};
+
   reaching_definitions_analysist *rd=
     dynamic_cast<reaching_definitions_analysist*>(&ai);
   INVARIANT_STRUCTURED(
diff --git a/src/analyses/reaching_definitions.h b/src/analyses/reaching_definitions.h
@@ -149,17 +149,17 @@ class rd_range_domaint:public ai_domain_baset
   /// `transform_*` method for the recognised instruction.
   /// \param function_from: Just passed to `transform_function_call` and
   ///   `transform_end_function` callees.
-  /// \param from: Reference to a GOTO instruction according to which `*this`
-  ///   instance should be transformed.
+  /// \param trace_from: The ai_history giving the GOTO instruction which
+  ///    `*this` instance should be transformed.
   /// \param function_to: Just passed to `transform_function_call` callee.
-  /// \param to: Just passed to `transform_end_function` callee.
+  /// \param trace_to: Just passed to `transform_end_function` callee.
   /// \param ai: A reference to 'reaching_definitions_analysist' instance.
   /// \param ns: Just passed to callees.
   void transform(
     const irep_idt &function_from,
-    locationt from,
+    trace_ptrt trace_from,
     const irep_idt &function_to,
-    locationt to,
+    trace_ptrt trace_to,
     ai_baset &ai,
     const namespacet &ns) final override;
 
diff --git a/src/analyses/uninitialized_domain.cpp b/src/analyses/uninitialized_domain.cpp
@@ -20,12 +20,14 @@ Date: January 2010
 
 void uninitialized_domaint::transform(
   const irep_idt &,
-  locationt from,
+  trace_ptrt trace_from,
   const irep_idt &,
-  locationt,
+  trace_ptrt,
   ai_baset &,
   const namespacet &ns)
 {
+  locationt from{trace_from->current_location()};
+
   if(has_values.is_false())
     return;
 
diff --git a/src/analyses/uninitialized_domain.h b/src/analyses/uninitialized_domain.h
@@ -31,9 +31,9 @@ class uninitialized_domaint:public ai_domain_baset
 
   void transform(
     const irep_idt &function_from,
-    locationt from,
+    trace_ptrt trace_from,
     const irep_idt &function_to,
-    locationt to,
+    trace_ptrt trace_to,
     ai_baset &ai,
     const namespacet &ns) final override;
 
diff --git a/src/analyses/variable-sensitivity/three_way_merge_abstract_interpreter.cpp b/src/analyses/variable-sensitivity/three_way_merge_abstract_interpreter.cpp
@@ -125,9 +125,9 @@ bool ai_three_way_merget::visit_edge_function_call(
     // but in VSD it does, so this cannot be omitted.
     s_working.transform(
       callee_function_id,
-      l_callee_end,
+      p_callee_end,
       calling_function_id,
-      l_return_site,
+      p_return_site,
       *this,
       ns);
 
diff --git a/src/analyses/variable-sensitivity/variable_sensitivity_dependence_graph.cpp b/src/analyses/variable-sensitivity/variable_sensitivity_dependence_graph.cpp
@@ -65,14 +65,17 @@ void variable_sensitivity_dependence_domaint::eval_data_deps(
  */
 void variable_sensitivity_dependence_domaint::transform(
   const irep_idt &function_from,
-  locationt from,
+  trace_ptrt trace_from,
   const irep_idt &function_to,
-  locationt to,
+  trace_ptrt trace_to,
   ai_baset &ai,
   const namespacet &ns)
 {
+  locationt from{trace_from->current_location()};
+  locationt to{trace_to->current_location()};
+
   variable_sensitivity_domaint::transform(
-    function_from, from, function_to, to, ai, ns);
+    function_from, trace_from, function_to, trace_to, ai, ns);
 
   variable_sensitivity_dependence_grapht *dep_graph =
     dynamic_cast<variable_sensitivity_dependence_grapht *>(&ai);
diff --git a/src/analyses/variable-sensitivity/variable_sensitivity_dependence_graph.h b/src/analyses/variable-sensitivity/variable_sensitivity_dependence_graph.h
@@ -81,9 +81,9 @@ class variable_sensitivity_dependence_domaint
 
   void transform(
     const irep_idt &function_from,
-    locationt from,
+    trace_ptrt trace_from,
     const irep_idt &function_to,
-    locationt to,
+    trace_ptrt trace_to,
     ai_baset &ai,
     const namespacet &ns) override;
 
diff --git a/src/analyses/variable-sensitivity/variable_sensitivity_domain.cpp b/src/analyses/variable-sensitivity/variable_sensitivity_domain.cpp
diff --git a/src/analyses/variable-sensitivity/variable_sensitivity_domain.h b/src/analyses/variable-sensitivity/variable_sensitivity_domain.h
diff --git a/unit/analyses/ai/ai.cpp b/unit/analyses/ai/ai.cpp
diff --git a/unit/analyses/ai/ai_simplify_lhs.cpp b/unit/analyses/ai/ai_simplify_lhs.cpp
