dependence graph now tracks a function identifier

Author: Daniel Kroening

src/analyses/dependence_graph.cpp

@@ -53,6 +53,7 @@ bool dep_graph_domaint::merge(
 }
 
 void dep_graph_domaint::control_dependencies(
+  const irep_idt &function_identifier,
   goto_programt::const_targett from,
   goto_programt::const_targett to,
   dependence_grapht &dep_graph)
@@ -83,7 +84,7 @@ void dep_graph_domaint::control_dependencies(
 
   // Get postdominators
 
-  const irep_idt id=from->function;
+  const irep_idt id=function_identifier;
   const cfg_post_dominatorst &pd=dep_graph.cfg_post_dominators().at(id);
 
   // Check all candidates
@@ -206,7 +207,7 @@ void dep_graph_domaint::transform(
   {
     if(function_from == function_to)
     {
-      control_dependencies(from, to, *dep_graph);
+      control_dependencies(function_from, from, to, *dep_graph);
     }
     else
     {
@@ -232,7 +233,7 @@ void dep_graph_domaint::transform(
     }
   }
   else
-    control_dependencies(from, to, *dep_graph);
+    control_dependencies(function_from, from, to, *dep_graph);
 
   data_dependencies(from, to, *dep_graph, ns);
 }

src/analyses/dependence_graph.h

@@ -203,6 +203,7 @@ class dep_graph_domaint:public ai_domain_baset
     dependence_graph_test_get_data_deps(const dep_graph_domaint &);
 
   void control_dependencies(
+    const irep_idt &function_identifier,
     goto_programt::const_targett from,
     goto_programt::const_targett to,
     dependence_grapht &dep_graph);
@@ -236,18 +237,6 @@ class dependence_grapht:
     rd(goto_functions, ns);
   }
 
-  void initialize(const goto_programt &goto_program)
-  {
-    ait<dep_graph_domaint>::initialize(goto_program);
-
-    if(!goto_program.empty())
-    {
-      const irep_idt id=goto_programt::get_function_id(goto_program);
-      cfg_post_dominatorst &pd=post_dominators[id];
-      pd(goto_program);
-    }
-  }
-
   void finalize()
   {
     for(const auto &location_state : state_map)