ai_baset: output now requires function identifier

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: Daniel Kroening

src/analyses/ai.cpp

@@ -35,15 +35,15 @@ void ai_baset::output(
       out << "////\n";
       out << "\n";
 
-      output(ns, f_it->second.body, f_it->first, out);
+      output(ns, f_it->first, f_it->second.body, out);
     }
   }
 }
 
 void ai_baset::output(
   const namespacet &ns,
+  const irep_idt &function_identifier,
   const goto_programt &goto_program,
-  const irep_idt &identifier,
   std::ostream &out) const
 {
   forall_goto_program_instructions(i_it, goto_program)
@@ -54,7 +54,7 @@ void ai_baset::output(
     abstract_state_before(i_it)->output(out, *this, ns);
     out << "\n";
     #if 1
-    goto_program.output_instruction(ns, identifier, out, *i_it);
+    goto_program.output_instruction(ns, function_identifier, out, *i_it);
     out << "\n";
     #endif
   }
@@ -70,8 +70,8 @@ jsont ai_baset::output_json(
   {
     if(f_it->second.body_available())
     {
-      result[id2string(f_it->first)]=
-        output_json(ns, f_it->second.body, f_it->first);
+      result[id2string(f_it->first)] =
+        output_json(ns, f_it->first, f_it->second.body);
     }
     else
     {
@@ -90,16 +90,16 @@ jsont ai_baset::output_json(
 /// \return The JSON object
 jsont ai_baset::output_json(
   const namespacet &ns,
-  const goto_programt &goto_program,
-  const irep_idt &identifier) const
+  const irep_idt &function,
+  const goto_programt &goto_program) const
 {
   json_arrayt contents;
 
   forall_goto_program_instructions(i_it, goto_program)
   {
     // Ideally we need output_instruction_json
     std::ostringstream out;
-    goto_program.output_instruction(ns, identifier, out, *i_it);
+    goto_program.output_instruction(ns, function, out, *i_it);
 
     json_objectt location(
       {{"locationNumber", json_numbert(std::to_string(i_it->location_number))},
@@ -129,7 +129,7 @@ xmlt ai_baset::output_xml(
 
     if(f_it->second.body_available())
     {
-      function.new_element(output_xml(ns, f_it->second.body, f_it->first));
+      function.new_element(output_xml(ns, f_it->first, f_it->second.body));
     }
 
     program.new_element(function);
@@ -146,8 +146,8 @@ xmlt ai_baset::output_xml(
 /// \return The XML object
 xmlt ai_baset::output_xml(
   const namespacet &ns,
-  const goto_programt &goto_program,
-  const irep_idt &identifier) const
+  const irep_idt &function,
+  const goto_programt &goto_program) const
 {
   xmlt function_body;
 
@@ -161,7 +161,7 @@ xmlt ai_baset::output_xml(
 
     // Ideally we need output_instruction_xml
     std::ostringstream out;
-    goto_program.output_instruction(ns, identifier, out, *i_it);
+    goto_program.output_instruction(ns, function, out, *i_it);
     location.set_attribute("instruction", out.str());
 
     function_body.new_element(location);

src/analyses/ai.h

@@ -124,6 +124,18 @@ class ai_baset
   {
   }
 
+  /// Output the abstract states for a single function
+  /// \param ns: The namespace
+  /// \param identifier: The identifier used to find a symbol to identify the
+  /// \param goto_program: The goto program
+  ///   source language
+  /// \param out: The ostream to direct output to
+  virtual void output(
+    const namespacet &ns,
+    const irep_idt &identifier,
+    const goto_programt &goto_program,
+    std::ostream &out) const;
+
   /// Output the abstract states for a whole program
   virtual void output(
     const namespacet &ns,
@@ -139,22 +151,13 @@ class ai_baset
     output(ns, goto_model.goto_functions, out);
   }
 
-  /// Output the abstract states for a function
-  void output(
-    const namespacet &ns,
-    const goto_programt &goto_program,
-    std::ostream &out) const
-  {
-    output(ns, goto_program, "", out);
-  }
-
   /// Output the abstract states for a function
   void output(
     const namespacet &ns,
     const goto_functionst::goto_functiont &goto_function,
     std::ostream &out) const
   {
-    output(ns, goto_function.body, "", out);
+    output(ns, "", goto_function.body, out);
   }
 
   /// Output the abstract states for the whole program as JSON
@@ -175,15 +178,15 @@ class ai_baset
     const namespacet &ns,
     const goto_programt &goto_program) const
   {
-    return output_json(ns, goto_program, "");
+    return output_json(ns, "", goto_program);
   }
 
   /// Output the abstract states for a single function as JSON
   jsont output_json(
     const namespacet &ns,
     const goto_functionst::goto_functiont &goto_function) const
   {
-    return output_json(ns, goto_function.body, "");
+    return output_json(ns, "", goto_function.body);
   }
 
   /// Output the abstract states for the whole program as XML
@@ -204,15 +207,15 @@ class ai_baset
     const namespacet &ns,
     const goto_programt &goto_program) const
   {
-    return output_xml(ns, goto_program, "");
+    return output_xml(ns, "", goto_program);
   }
 
   /// Output the abstract states for a single function as XML
   xmlt output_xml(
     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:
@@ -239,18 +242,6 @@ class ai_baset
   /// entry state required by the analysis
   void entry_state(const goto_functionst &goto_functions);
 
-  /// Output the abstract states for a single function
-  /// \param ns: The namespace
-  /// \param goto_program: The goto program
-  /// \param identifier: The identifier used to find a symbol to identify the
-  ///   source language
-  /// \param out: The ostream to direct output to
-  virtual void output(
-    const namespacet &ns,
-    const goto_programt &goto_program,
-    const irep_idt &identifier,
-    std::ostream &out) const;
-
   /// Output the abstract states for a single function as JSON
   /// \param ns: The namespace
   /// \param goto_program: The goto program
@@ -259,8 +250,8 @@ class ai_baset
   /// \return The JSON object
   virtual jsont output_json(
     const namespacet &ns,
-    const goto_programt &goto_program,
-    const irep_idt &identifier) const;
+    const irep_idt &function,
+    const goto_programt &goto_program) const;
 
   /// Output the abstract states for a single function as XML
   /// \param ns: The namespace
@@ -270,8 +261,8 @@ class ai_baset
   /// \return The XML object
   virtual xmlt output_xml(
     const namespacet &ns,
-    const goto_programt &goto_program,
-    const irep_idt &identifier) const;
+    const irep_idt &function,
+    const goto_programt &goto_program) const;
 
   /// The work queue, sorted by location number
   typedef std::map<unsigned, locationt> working_sett;

src/goto-instrument/uninitialized.cpp

@@ -223,7 +223,7 @@ void show_uninitialized(
       out << "////\n\n";
       uninitialized_analysist uninitialized_analysis;
       uninitialized_analysis(f_it->first, f_it->second.body, ns);
-      uninitialized_analysis.output(ns, f_it->second.body, out);
+      uninitialized_analysis.output(ns, f_it->first, f_it->second.body, out);
     }
   }
 }