ai_baset::initialize now requires a function name

We are working towards removing the "function" field from
goto_programt::instructionst::instructiont, and thus need to pass the identifier
of the function whenever it actually is required.

Author: tautschnig

src/analyses/ai.cpp

@@ -187,12 +187,14 @@ void ai_baset::entry_state(const goto_programt &goto_program)
   get_state(goto_program.instructions.begin()).make_entry();
 }
 
-void ai_baset::initialize(const goto_functionst::goto_functiont &goto_function)
+void ai_baset::initialize(
+  const irep_idt &function_identifier,
+  const goto_functionst::goto_functiont &goto_function)
 {
-  initialize(goto_function.body);
+  initialize(function, goto_function.body);
 }
 
-void ai_baset::initialize(const goto_programt &goto_program)
+void ai_baset::initialize(const irep_idt &, const goto_programt &goto_program)
 {
   // we mark everything as unreachable as starting point
 
@@ -203,7 +205,7 @@ void ai_baset::initialize(const goto_programt &goto_program)
 void ai_baset::initialize(const goto_functionst &goto_functions)
 {
   forall_goto_functions(it, goto_functions)
-    initialize(it->second);
+    initialize(it->first, it->second);
 }
 
 void ai_baset::finalize()

src/analyses/ai.h

@@ -50,7 +50,7 @@ class ai_baset
     const namespacet &ns)
   {
     goto_functionst goto_functions;
-    initialize(goto_program);
+    initialize(function_identifier, goto_program);
     entry_state(goto_program);
     fixedpoint(function_identifier, goto_program, goto_functions, ns);
     finalize();
@@ -84,7 +84,7 @@ class ai_baset
     const namespacet &ns)
   {
     goto_functionst goto_functions;
-    initialize(goto_function);
+    initialize(function_identifier, goto_function);
     entry_state(goto_function.body);
     fixedpoint(function_identifier, goto_function.body, goto_functions, ns);
     finalize();
@@ -212,16 +212,20 @@ class ai_baset
     const namespacet &ns,
     const goto_functionst::goto_functiont &goto_function) const
   {
-    return output_xml(ns, goto_function.body, "");
+    return output_xml(ns, "", goto_function.body);
   }
 
 protected:
   /// Initialize all the abstract states for a single function. Override this to
   /// do custom per-domain initialization.
-  virtual void initialize(const goto_programt &goto_program);
+  virtual void initialize(
+    const irep_idt &function_identifier,
+    const goto_programt &goto_program);
 
   /// Initialize all the abstract states for a single function.
-  virtual void initialize(const goto_functionst::goto_functiont &goto_function);
+  virtual void initialize(
+    const irep_idt &function_identifier,
+    const goto_functionst::goto_functiont &goto_function);
 
   /// Initialize all the abstract states for a whole program. Override this to
   /// do custom per-analysis initialization.

src/analyses/dependence_graph.h

@@ -236,14 +236,13 @@ class dependence_grapht:
     rd(goto_functions, ns);
   }
 
-  void initialize(const goto_programt &goto_program)
+  void initialize(const irep_idt &function, const goto_programt &goto_program)
   {
-    ait<dep_graph_domaint>::initialize(goto_program);
+    ait<dep_graph_domaint>::initialize(function, goto_program);
 
     if(!goto_program.empty())
     {
-      const irep_idt id=goto_programt::get_function_id(goto_program);
-      cfg_post_dominatorst &pd=post_dominators[id];
+      cfg_post_dominatorst &pd = post_dominators[function];
       pd(goto_program);
     }
   }

src/analyses/invariant_propagation.cpp

@@ -202,9 +202,11 @@ bool invariant_propagationt::check_type(const typet &type) const
   return false;
 }
 
-void invariant_propagationt::initialize(const goto_programt &goto_program)
+void invariant_propagationt::initialize(
+  const irep_idt &function,
+  const goto_programt &goto_program)
 {
-  baset::initialize(goto_program);
+  baset::initialize(function, goto_program);
 
   forall_goto_program_instructions(it, goto_program)
   {
@@ -228,7 +230,7 @@ void invariant_propagationt::initialize(const goto_functionst &goto_functions)
   baset::initialize(goto_functions);
 
   forall_goto_functions(f_it, goto_functions)
-    initialize(f_it->second.body);
+    initialize(f_it->first, f_it->second.body);
 }
 
 void invariant_propagationt::simplify(goto_functionst &goto_functions)

src/analyses/invariant_propagation.h

@@ -36,7 +36,8 @@ class invariant_propagationt:public
     return (*this)[l].invariant_set;
   }
 
-  virtual void initialize(const goto_programt &goto_program);
+  virtual void
+  initialize(const irep_idt &function, const goto_programt &goto_program);
   virtual void initialize(const goto_functionst &goto_functions);
 
   void make_all_true();