Revert "bugfix: must do .update() after remove_returns"

This reverts commit abbb389.

In diffblue#2089 a broad cleanup of redundant calls to .update() was done. Let's stay in
this spirit and call .update() when necessary, and not "just to be safe."

Author: tautschnig

src/goto-instrument/goto_instrument_parse_options.cpp

@@ -447,10 +447,6 @@ int goto_instrument_parse_optionst::doit()
     if(cmdline.isset("check-call-sequence"))
     {
       do_remove_returns();
-
-      // recalculate numbers, etc.
-      goto_model.goto_functions.update();
-
       check_call_sequence(goto_model);
       return CPROVER_EXIT_SUCCESS;
     }
@@ -1447,9 +1443,6 @@ void goto_instrument_parse_optionst::instrument_goto_program()
   {
     do_indirect_call_and_rtti_removal();
 
-    // recalculate numbers, etc.
-    goto_model.goto_functions.update();
-
     status() << "Performing a reachability slice" << eom;
     if(cmdline.isset("property"))
       reachability_slicer(goto_model, cmdline.get_values("property"));
@@ -1461,9 +1454,6 @@ void goto_instrument_parse_optionst::instrument_goto_program()
   {
     do_indirect_call_and_rtti_removal();
 
-    // recalculate numbers, etc.
-    goto_model.goto_functions.update();
-
     status() << "Performing a function pointer reachability slice" << eom;
     function_path_reachability_slicer(
       goto_model, cmdline.get_comma_separated_values("fp-reachability-slice"));
@@ -1475,9 +1465,6 @@ void goto_instrument_parse_optionst::instrument_goto_program()
     do_indirect_call_and_rtti_removal();
     do_remove_returns();
 
-    // recalculate numbers, etc.
-    goto_model.goto_functions.update();
-
     status() << "Performing a full slice" << eom;
     if(cmdline.isset("property"))
       property_slicer(goto_model, cmdline.get_values("property"));