Replace iterator-typed parameter by mapped type to enable ranged-for

Future cleanup will replace iterator-based loops by ranged-for. To
prepare for this, adjust the interface of get_ranges. As a side benefit,
this avoids the risk of passing an invalid iterator.

Author: tautschnig

src/analyses/dependence_graph.cpp

@@ -163,7 +163,7 @@ void dep_graph_domaint::data_dependencies(
 
   forall_rw_range_set_r_objects(it, rw_set)
   {
-    const range_domaint &r_ranges=rw_set.get_ranges(it);
+    const range_domaint &r_ranges = rw_set.get_ranges(it->second);
     const rd_range_domaint::ranges_at_loct &w_ranges=
       dep_graph.reaching_definitions()[to].get(it->first);
 

src/analyses/goto_rw.h

@@ -136,10 +136,11 @@ class rw_range_sett
     return w_range_set;
   }
 
-  const range_domaint &get_ranges(objectst::const_iterator it) const
+  const range_domaint &
+  get_ranges(const std::unique_ptr<range_domain_baset> &ranges) const
   {
-    PRECONDITION(dynamic_cast<range_domaint*>(it->second.get())!=nullptr);
-    return static_cast<const range_domaint &>(*it->second);
+    PRECONDITION(dynamic_cast<range_domaint *>(ranges.get()) != nullptr);
+    return static_cast<const range_domaint &>(*ranges);
   }
 
   enum class get_modet { LHS_W, READ };
@@ -360,11 +361,12 @@ class rw_guarded_range_set_value_sett:public rw_range_set_value_sett
   {
   }
 
-  const guarded_range_domaint &get_ranges(objectst::const_iterator it) const
+  const guarded_range_domaint &
+  get_ranges(const std::unique_ptr<range_domain_baset> &ranges) const
   {
     PRECONDITION(
-      dynamic_cast<guarded_range_domaint*>(it->second.get())!=nullptr);
-    return static_cast<const guarded_range_domaint &>(*it->second);
+      dynamic_cast<guarded_range_domaint *>(ranges.get()) != nullptr);
+    return static_cast<const guarded_range_domaint &>(*ranges);
   }
 
   void get_objects_rec(

src/analyses/reaching_definitions.cpp

@@ -148,7 +148,7 @@ void rd_range_domaint::transform(
           continue;
         assert(symbol_ptr!=0);
 
-        const range_domaint &ranges=rw_set.get_ranges(it);
+        const range_domaint &ranges = rw_set.get_ranges(it->second);
 
         if(is_must_alias &&
            (!rd->get_is_threaded()(from) ||
@@ -357,7 +357,7 @@ void rd_range_domaint::transform_assign(
       nullptr_exceptiont,
       "Symbol is in symbol table");
 
-    const range_domaint &ranges=rw_set.get_ranges(it);
+    const range_domaint &ranges = rw_set.get_ranges(it->second);
 
     if(is_must_alias &&
        (!rd.get_is_threaded()(from) ||