ai and reaching definitions: use locationt instead of goto_programt::const_targett

Author: Daniel Kroening

src/analyses/ai.h

@@ -384,11 +384,8 @@ class ait:public ai_baset
   void dummy(const domainT &s) { const statet &x=s; (void)x; }
 
   // not implemented in sequential analyses
-  bool merge_shared(
-    const statet &,
-    goto_programt::const_targett,
-    goto_programt::const_targett,
-    const namespacet &) override
+  bool merge_shared(const statet &, locationt, locationt, const namespacet &)
+    override
   {
     throw "not implemented";
   }
@@ -398,7 +395,8 @@ template<typename domainT>
 class concurrency_aware_ait:public ait<domainT>
 {
 public:
-  typedef typename ait<domainT>::statet statet;
+  using statet = typename ait<domainT>::statet;
+  using locationt = typename statet::locationt;
 
   // constructor
   concurrency_aware_ait():ait<domainT>()
@@ -407,8 +405,8 @@ class concurrency_aware_ait:public ait<domainT>
 
   bool merge_shared(
     const statet &src,
-    goto_programt::const_targett from,
-    goto_programt::const_targett to,
+    locationt from,
+    locationt to,
     const namespacet &ns) override
   {
     statet &dest=this->get_state(to);

src/analyses/reaching_definitions.cpp

@@ -233,7 +233,7 @@ void rd_range_domaint::transform_end_function(
   locationt to,
   reaching_definitions_analysist &rd)
 {
-  goto_programt::const_targett call=to;
+  locationt call = to;
   --call;
   const code_function_callt &code=to_code_function_call(call->code);
 
@@ -666,8 +666,8 @@ bool rd_range_domaint::merge(
 /// \return returns true iff there is something new
 bool rd_range_domaint::merge_shared(
   const rd_range_domaint &other,
-  goto_programt::const_targett,
-  goto_programt::const_targett,
+  locationt,
+  locationt,
   const namespacet &ns)
 {
   // TODO: dirty vars

src/analyses/reaching_definitions.h

@@ -259,7 +259,7 @@ class reaching_definitions_analysist:
   virtual void initialize(
     const goto_functionst &goto_functions) override;
 
-  virtual statet &get_state(goto_programt::const_targett l) override
+  virtual statet &get_state(locationt l) override
   {
     statet &s=concurrency_aware_ait<rd_range_domaint>::get_state(l);