Cleanup remove_function_pointers API

Remove unused variants and change the last parameter to become
mandatory. Avoiding the default parameter ensures that upcoming changes
to the list of parameters will not miss any call sites.

Author: tautschnig

jbmc/src/jdiff/jdiff_parse_options.cpp

@@ -173,7 +173,7 @@ bool jdiff_parse_optionst::process_goto_program(
   log.status() << "Removing function pointers and virtual functions"
                << messaget::eom;
   remove_function_pointers(
-    ui_message_handler, goto_model, cmdline.isset("pointer-check"));
+    ui_message_handler, goto_model, cmdline.isset("pointer-check"), false);
 
   // Java virtual functions -> explicit dispatch tables:
   remove_virtual_functions(goto_model);

src/goto-instrument/goto_instrument_parse_options.cpp

@@ -946,7 +946,7 @@ void goto_instrument_parse_optionst::do_indirect_call_and_rtti_removal(
 
   log.status() << "Function Pointer Removal" << messaget::eom;
   remove_function_pointers(
-    ui_message_handler, goto_model, cmdline.isset("pointer-check"));
+    ui_message_handler, goto_model, cmdline.isset("pointer-check"), false);
   log.status() << "Virtual function removal" << messaget::eom;
   remove_virtual_functions(goto_model);
   log.status() << "Cleaning inline assembler statements" << messaget::eom;

src/goto-programs/process_goto_program.cpp

@@ -45,7 +45,8 @@ bool process_goto_program(
   remove_function_pointers(
     log.get_message_handler(),
     goto_model,
-    options.get_bool_option("pointer-check"));
+    options.get_bool_option("pointer-check"),
+    false);
 
   mm_io(goto_model);
 

src/goto-programs/remove_function_pointers.cpp

@@ -539,53 +539,18 @@ void remove_function_pointerst::operator()(goto_functionst &functions)
     functions.compute_location_numbers();
 }
 
-bool remove_function_pointers(
-  message_handlert &_message_handler,
-  symbol_tablet &symbol_table,
-  const goto_functionst &goto_functions,
-  goto_programt &goto_program,
-  const irep_idt &function_id,
-  bool add_safety_assertion,
-  bool only_remove_const_fps)
-{
-  remove_function_pointerst
-    rfp(
-      _message_handler,
-      symbol_table,
-      add_safety_assertion,
-      only_remove_const_fps,
-      goto_functions);
-
-  return rfp.remove_function_pointers(goto_program, function_id);
-}
-
 void remove_function_pointers(
   message_handlert &_message_handler,
-  symbol_tablet &symbol_table,
-  goto_functionst &goto_functions,
-  bool add_safety_assertion,
-  bool only_remove_const_fps)
-{
-  remove_function_pointerst
-    rfp(
-      _message_handler,
-      symbol_table,
-      add_safety_assertion,
-      only_remove_const_fps,
-      goto_functions);
-
-  rfp(goto_functions);
-}
-
-void remove_function_pointers(message_handlert &_message_handler,
   goto_modelt &goto_model,
   bool add_safety_assertion,
   bool only_remove_const_fps)
 {
-  remove_function_pointers(
+  remove_function_pointerst rfp(
     _message_handler,
     goto_model.symbol_table,
-    goto_model.goto_functions,
     add_safety_assertion,
-    only_remove_const_fps);
+    only_remove_const_fps,
+    goto_model.goto_functions);
+
+  rfp(goto_model.goto_functions);
 }

src/goto-programs/remove_function_pointers.h

@@ -29,23 +29,7 @@ void remove_function_pointers(
   message_handlert &_message_handler,
   goto_modelt &goto_model,
   bool add_safety_assertion,
-  bool only_remove_const_fps=false);
-
-void remove_function_pointers(
-  message_handlert &_message_handler,
-  symbol_tablet &symbol_table,
-  goto_functionst &goto_functions,
-  bool add_safety_assertion,
-  bool only_remove_const_fps=false);
-
-bool remove_function_pointers(
-  message_handlert &_message_handler,
-  symbol_tablet &symbol_table,
-  const goto_functionst &goto_functions,
-  goto_programt &goto_program,
-  const irep_idt &function_id,
-  bool add_safety_assertion,
-  bool only_remove_const_fps = false);
+  bool only_remove_const_fps);
 
 /// Replace a call to a dynamic function at location
 /// target in the given goto-program by a case-split