Merge pull request #3840 from tautschnig/function-unreachable_instruc…

…tions unreachable_instructions now passes down function identifier [blocks: #3126]
diffblue · Jan 28, 2019 · 053b556 · 053b556
2 parents 22517a3 + b6f6ebe
commit 053b556
Showing 1 changed file with 12 additions and 22 deletions.
diff --git a/src/goto-analyzer/unreachable_instructions.cpp b/src/goto-analyzer/unreachable_instructions.cpp
@@ -65,38 +65,27 @@ static void build_dead_map_from_ai(
 
 static void output_dead_plain(
   const namespacet &ns,
+  const irep_idt &function_identifier,
   const goto_programt &goto_program,
   const dead_mapt &dead_map,
   std::ostream &os)
 {
-  assert(!goto_program.instructions.empty());
-  goto_programt::const_targett end_function=
-    goto_program.instructions.end();
-  --end_function;
-  assert(end_function->is_end_function());
-
-  os << "\n*** " << end_function->function << " ***\n";
+  os << "\n*** " << function_identifier << " ***\n";
 
   for(dead_mapt::const_iterator it=dead_map.begin();
       it!=dead_map.end();
       ++it)
-    goto_program.output_instruction(ns, "", os, *it->second);
+    goto_program.output_instruction(ns, function_identifier, os, *it->second);
 }
 
 static void add_to_xml(
+  const irep_idt &function_identifier,
   const goto_programt &goto_program,
   const dead_mapt &dead_map,
   xmlt &dest)
 {
-  PRECONDITION(!goto_program.instructions.empty());
-  goto_programt::const_targett end_function=
-    goto_program.instructions.end();
-  --end_function;
-  DATA_INVARIANT(end_function->is_end_function(),
-                 "The last instruction in a goto-program must be END_FUNCTION");
-
   xmlt &x = dest.new_element("function");
-  x.set_attribute("name", id2string(end_function->function));
+  x.set_attribute("name", id2string(function_identifier));
 
   for(dead_mapt::const_iterator it=dead_map.begin();
       it!=dead_map.end();
@@ -113,6 +102,7 @@ static void add_to_xml(
 
 static void add_to_json(
   const namespacet &ns,
+  const irep_idt &function_identifier,
   const goto_programt &goto_program,
   const dead_mapt &dead_map,
   json_arrayt &dest)
@@ -125,7 +115,7 @@ static void add_to_json(
                  "The last instruction in a goto-program must be END_FUNCTION");
 
   json_objectt entry(
-    {{"function", json_stringt(end_function->function)},
+    {{"function", json_stringt(function_identifier)},
      {"fileName",
       json_stringt(concat_dir_file(
         id2string(end_function->source_location.get_working_directory()),
@@ -192,9 +182,9 @@ void unreachable_instructions(
     if(!dead_map.empty())
     {
       if(!json)
-        output_dead_plain(ns, goto_program, dead_map, os);
+        output_dead_plain(ns, f_it->first, goto_program, dead_map, os);
       else
-        add_to_json(ns, goto_program, dead_map, json_result);
+        add_to_json(ns, f_it->first, goto_program, dead_map, json_result);
     }
   }
 
@@ -226,16 +216,16 @@ bool static_unreachable_instructions(
     {
       if(options.get_bool_option("json"))
       {
-        add_to_json(ns, f_it->second.body, dead_map, json_result);
+        add_to_json(ns, f_it->first, f_it->second.body, dead_map, json_result);
       }
       else if(options.get_bool_option("xml"))
       {
-        add_to_xml(f_it->second.body, dead_map, xml_result);
+        add_to_xml(f_it->first, f_it->second.body, dead_map, xml_result);
       }
       else
       {
         // text or console
-        output_dead_plain(ns, f_it->second.body, dead_map, out);
+        output_dead_plain(ns, f_it->first, f_it->second.body, dead_map, out);
       }
     }
   }