Revert "Update location numbers after adding instructions"

This reverts commit 309ad6e.

Author: tautschnig

src/goto-programs/remove_returns.cpp

@@ -44,7 +44,7 @@ class remove_returnst
     const irep_idt &function_id,
     goto_functionst::goto_functiont &function);
 
-  bool do_function_calls(
+  void do_function_calls(
     function_is_stubt function_is_stub,
     goto_programt &goto_program);
 
@@ -142,14 +142,10 @@ void remove_returnst::replace_returns(
 /// \param function_is_stub: function (irep_idt -> bool) that determines whether
 ///   a given function ID is a stub
 /// \param goto_program: program to transform
-/// \return True if, and only if, instructions have been inserted. In that case
-///   the caller must invoke an appropriate method to update location numbers.
-bool remove_returnst::do_function_calls(
+void remove_returnst::do_function_calls(
   function_is_stubt function_is_stub,
   goto_programt &goto_program)
 {
-  bool requires_update = false;
-
   Forall_goto_program_instructions(i_it, goto_program)
   {
     if(i_it->is_function_call())
@@ -225,17 +221,13 @@ bool remove_returnst::do_function_calls(
               t_a,
               goto_programt::make_dead(*return_value, i_it->source_location));
           }
-
-          requires_update = true;
         }
 
         // update the call
         i_it->set_function_call(function_call);
       }
     }
   }
-
-  return requires_update;
 }
 
 void remove_returnst::operator()(goto_functionst &goto_functions)
@@ -252,8 +244,7 @@ void remove_returnst::operator()(goto_functionst &goto_functions)
     };
 
     replace_returns(it->first, it->second);
-    if(do_function_calls(function_is_stub, it->second.body))
-      goto_functions.compute_location_numbers(it->second.body);
+    do_function_calls(function_is_stub, it->second.body);
   }
 }
 
@@ -270,8 +261,7 @@ void remove_returnst::operator()(
     return;
 
   replace_returns(model_function.get_function_id(), goto_function);
-  if(do_function_calls(function_is_stub, goto_function.body))
-    model_function.compute_location_numbers();
+  do_function_calls(function_is_stub, goto_function.body);
 }
 
 /// removes returns