as_string() on instructions now takes function identifier

Author: kroening

src/goto-programs/goto_program.cpp

@@ -399,6 +399,7 @@ std::list<exprt> objects_written(
 
 std::string as_string(
   const class namespacet &ns,
+  const irep_idt &function,
   const goto_programt::instructiont &i)
 {
   std::string result;
@@ -412,7 +413,7 @@ std::string as_string(
     if(!i.guard.is_true())
     {
       result+="IF "
-            +from_expr(ns, i.function, i.guard)
+            +from_expr(ns, function, i.guard)
             +" THEN ";
     }
 
@@ -435,7 +436,7 @@ std::string as_string(
   case DEAD:
   case FUNCTION_CALL:
   case ASSIGN:
-    return from_expr(ns, i.function, i.code);
+    return from_expr(ns, function, i.code);
 
   case ASSUME:
   case ASSERT:
@@ -444,7 +445,7 @@ std::string as_string(
     else
       result+="ASSERT ";
 
-    result+=from_expr(ns, i.function, i.guard);
+    result+=from_expr(ns, function, i.guard);
 
     {
       const irep_idt &comment=i.source_location.get_comment();

src/goto-programs/goto_program.h

@@ -813,6 +813,7 @@ std::list<exprt> expressions_written(const goto_programt::instructiont &);
 
 std::string as_string(
   const namespacet &ns,
+  const irep_idt &function,
   const goto_programt::instructiont &);
 
 #endif // CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_H

src/goto-programs/goto_trace.cpp

@@ -284,7 +284,7 @@ void show_state_header(
 
   if(options.show_code)
   {
-    out << as_string(ns, *state.pc)
+    out << as_string(ns, state.function, *state.pc)
         << "\n";
     out << "----------------------------------------------------"
         << "\n";