Merge pull request #5981 from jezhiggins/vsd-widening-prep

Change domain merge(...) to take trace_ptrts rather than locationt.

Author: martin-cs

src/analyses/ai_domain.h

@@ -214,9 +214,7 @@ class ai_domain_factoryt : public ai_domain_factory_baset
   {
     // For backwards compatability, use the location version
     return static_cast<domainT &>(dest).merge(
-      static_cast<const domainT &>(src),
-      from->current_location(),
-      to->current_location());
+      static_cast<const domainT &>(src), from, to);
   }
 };
 

src/analyses/constant_propagator.cpp

@@ -638,8 +638,8 @@ bool constant_propagator_domaint::valuest::meet(
 /// \return Return true if "this" has changed.
 bool constant_propagator_domaint::merge(
   const constant_propagator_domaint &other,
-  locationt,
-  locationt)
+  trace_ptrt,
+  trace_ptrt)
 {
   return values.merge(other.values);
 }

src/analyses/constant_propagator.h

@@ -48,8 +48,8 @@ class constant_propagator_domaint:public ai_domain_baset
 
   bool merge(
     const constant_propagator_domaint &other,
-    locationt from,
-    locationt to);
+    trace_ptrt from,
+    trace_ptrt to);
 
   virtual bool ai_simplify(
     exprt &condition,

src/analyses/custom_bitvector_analysis.cpp

@@ -609,8 +609,8 @@ void custom_bitvector_domaint::output(
 
 bool custom_bitvector_domaint::merge(
   const custom_bitvector_domaint &b,
-  locationt,
-  locationt)
+  trace_ptrt,
+  trace_ptrt)
 {
   bool changed=has_values.is_false();
   has_values=tvt::unknown();

src/analyses/custom_bitvector_analysis.h

@@ -71,10 +71,7 @@ class custom_bitvector_domaint:public ai_domain_baset
     return has_values.is_true();
   }
 
-  bool merge(
-    const custom_bitvector_domaint &b,
-    locationt from,
-    locationt to);
+  bool merge(const custom_bitvector_domaint &b, trace_ptrt from, trace_ptrt to);
 
   typedef unsigned long long bit_vectort;
 

src/analyses/dependence_graph.cpp

@@ -21,8 +21,8 @@ Date: August 2013
 
 bool dep_graph_domaint::merge(
   const dep_graph_domaint &src,
-  goto_programt::const_targett,
-  goto_programt::const_targett)
+  trace_ptrt,
+  trace_ptrt)
 {
   // An abstract state at location `to` may be non-bottom even if
   // `merge(..., `to`) has not been called so far. This is due to the special

src/analyses/dependence_graph.h

@@ -73,10 +73,7 @@ class dep_graph_domaint:public ai_domain_baset
   {
   }
 
-  bool merge(
-    const dep_graph_domaint &src,
-    goto_programt::const_targett from,
-    goto_programt::const_targett to);
+  bool merge(const dep_graph_domaint &src, trace_ptrt from, trace_ptrt to);
 
   void transform(
     const irep_idt &function_from,

src/analyses/escape_analysis.cpp

@@ -326,10 +326,7 @@ void escape_domaint::output(
   }
 }
 
-bool escape_domaint::merge(
-  const escape_domaint &b,
-  locationt,
-  locationt)
+bool escape_domaint::merge(const escape_domaint &b, trace_ptrt, trace_ptrt)
 {
   bool changed=has_values.is_false();
   has_values=tvt::unknown();

src/analyses/escape_analysis.h

@@ -41,10 +41,7 @@ class escape_domaint:public ai_domain_baset
     const ai_baset &ai,
     const namespacet &ns) const final override;
 
-  bool merge(
-    const escape_domaint &b,
-    locationt from,
-    locationt to);
+  bool merge(const escape_domaint &b, trace_ptrt from, trace_ptrt to);
 
   void make_bottom() final override
   {

src/analyses/global_may_alias.cpp

@@ -197,8 +197,8 @@ void global_may_alias_domaint::output(
 
 bool global_may_alias_domaint::merge(
   const global_may_alias_domaint &b,
-  locationt,
-  locationt)
+  trace_ptrt,
+  trace_ptrt)
 {
   bool changed=has_values.is_false();
   has_values=tvt::unknown();