Merge pull request #4038 from tautschnig/output_functions

Pass a non-empty identifier to output functions

Author: tautschnig

src/goto-analyzer/unreachable_instructions.cpp

@@ -128,7 +128,7 @@ static void add_to_json(
       ++it)
   {
     std::ostringstream oss;
-    goto_program.output_instruction(ns, "", oss, *it->second);
+    goto_program.output_instruction(ns, function_identifier, oss, *it->second);
     std::string s=oss.str();
 
     std::string::size_type n=s.find('\n');

src/goto-instrument/goto_instrument_parse_options.cpp

@@ -246,7 +246,7 @@ int goto_instrument_parse_optionst::doit()
 
         forall_goto_program_instructions(i_it, goto_program)
         {
-          goto_program.output_instruction(ns, "", std::cout, *i_it);
+          goto_program.output_instruction(ns, f_it->first, std::cout, *i_it);
           std::cout << "Is threaded: " << (is_threaded(i_it)?"True":"False")
                     << "\n\n";
         }

src/goto-instrument/unwind.cpp

@@ -278,7 +278,7 @@ void goto_unwindt::unwind(
     symbol_tablet st;
     namespacet ns(st);
     std::cout << "Instruction:\n";
-    goto_program.output_instruction(ns, "", std::cout, *i_it);
+    goto_program.output_instruction(ns, function_id, std::cout, *i_it);
 #endif
 
     if(!i_it->is_backwards_goto())

src/goto-programs/goto_inline_class.cpp

@@ -751,7 +751,7 @@ void goto_inlinet::output_inline_map(
         bool transitive=call.second;
 
         out << "  Call:\n";
-        goto_program.output_instruction(ns, "", out, *target);
+        goto_program.output_instruction(ns, id, out, *target);
         out << "  Transitive: " << transitive << "\n";
       }
     }