Remove obsolete rebuild_goto_start_function class

Removes the need for templates and
dependency on lazy_goto_modelt.

Author: peterschrammel

src/goto-programs/initialize_goto_model.cpp

@@ -20,8 +20,9 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/options.h>
 #include <util/unicode.h>
 
-#include <langapi/mode.h>
 #include <langapi/language.h>
+#include <langapi/language_file.h>
+#include <langapi/mode.h>
 
 #include <goto-programs/rebuild_goto_start_function.h>
 #include <util/exception_utils.h>
@@ -151,11 +152,21 @@ goto_modelt initialize_goto_model(
 
   if(binaries_provided_start && options.is_set("function"))
   {
-    // Rebuild the entry-point, using the language annotation of the
-    // existing __CPROVER_start function:
-    rebuild_goto_start_functiont rebuild_existing_start(
-      options, goto_model, msg.get_message_handler());
-    entry_point_generation_failed=rebuild_existing_start();
+    // Get the language annotation of the existing __CPROVER_start function.
+    std::unique_ptr<languaget> language = get_entry_point_language(
+      goto_model.symbol_table, options, message_handler);
+
+    // To create a new entry point we must first remove the old one
+    remove_existing_entry_point(goto_model.symbol_table);
+
+    // Create the new entry-point
+    entry_point_generation_failed =
+      language->generate_support_functions(goto_model.symbol_table);
+
+    // Remove the function from the goto functions so it is copied back in
+    // from the symbol table during goto_convert
+    if(!entry_point_generation_failed)
+      goto_model.unload(goto_functionst::entry_point());
   }
   else if(!binaries_provided_start)
   {

src/goto-programs/lazy_goto_model.cpp

@@ -201,11 +201,21 @@ void lazy_goto_modelt::initialize(
 
   if(binaries_provided_start && options.is_set("function"))
   {
-    // Rebuild the entry-point, using the language annotation of the
-    // existing __CPROVER_start function:
-    rebuild_lazy_goto_start_functiont rebuild_existing_start(
-      options, *this, message_handler);
-    entry_point_generation_failed=rebuild_existing_start();
+    // Get the language annotation of the existing __CPROVER_start function.
+    std::unique_ptr<languaget> language =
+      get_entry_point_language(symbol_table, options, message_handler);
+
+    // To create a new entry point we must first remove the old one
+    remove_existing_entry_point(symbol_table);
+
+    // Create the new entry-point
+    entry_point_generation_failed =
+      language->generate_support_functions(symbol_table);
+
+    // Remove the function from the goto functions so it is copied back in
+    // from the symbol table during goto_convert
+    if(!entry_point_generation_failed)
+      unload(goto_functionst::entry_point());
   }
   else if(!binaries_provided_start)
   {

src/goto-programs/rebuild_goto_start_function.cpp

@@ -19,50 +19,9 @@ Author: Thomas Kiley, thomas@diffblue.com
 #include <langapi/mode.h>
 #include <langapi/language.h>
 
-#include <memory>
-
-/// To rebuild the _start function in the event the program was compiled into
-/// GOTO with a different entry function selected.
-/// \param options: Command-line options
-/// \param goto_model: The goto functions (to replace the body of the _start
-///   function) and symbol table (to replace the _start function symbol) of the
-///   program.
-/// \param message_handler: The message handler to report any messages with
-template <typename maybe_lazy_goto_modelt>
-rebuild_goto_start_function_baset<maybe_lazy_goto_modelt>::
-  rebuild_goto_start_function_baset(
-    const optionst &options,
-    maybe_lazy_goto_modelt &goto_model,
-    message_handlert &message_handler)
-  : messaget(message_handler), options(options), goto_model(goto_model)
-{
-}
-
-/// To rebuild the _start function in the event the program was compiled into
-/// GOTO with a different entry function selected. It works by discarding the
-/// _start symbol and GOTO function and calling on the relevant languaget to
-/// generate the _start function again.
-/// \return Returns true if either the symbol is not found, or something went
-///   wrong with generating the start_function. False otherwise.
-template<typename maybe_lazy_goto_modelt>
-bool rebuild_goto_start_function_baset<maybe_lazy_goto_modelt>::operator()()
-{
-  std::unique_ptr<languaget> language = get_entry_point_language(
-    goto_model.symbol_table, options, get_message_handler());
+#include <goto-programs/goto_functions.h>
 
-  // To create a new entry point we must first remove the old one
-  remove_existing_entry_point(goto_model.symbol_table);
-
-  bool return_code=
-    language->generate_support_functions(goto_model.symbol_table);
-
-  // Remove the function from the goto functions so it is copied back in
-  // from the symbol table during goto_convert
-  if(!return_code)
-    goto_model.unload(goto_functionst::entry_point());
-
-  return return_code;
-}
+#include <memory>
 
 std::unique_ptr<languaget> get_entry_point_language(
   const symbol_table_baset &symbol_table,
@@ -109,6 +68,3 @@ void remove_existing_entry_point(symbol_table_baset &symbol_table)
     symbol_table.remove(entry_point_symbol);
   }
 }
-
-template class rebuild_goto_start_function_baset<goto_modelt>;
-template class rebuild_goto_start_function_baset<lazy_goto_modelt>;

src/goto-programs/rebuild_goto_start_function.h

@@ -12,39 +12,21 @@ Author: Thomas Kiley, thomas@diffblue.com
 #ifndef CPROVER_GOTO_PROGRAMS_REBUILD_GOTO_START_FUNCTION_H
 #define CPROVER_GOTO_PROGRAMS_REBUILD_GOTO_START_FUNCTION_H
 
-#include <util/message.h>
-class optionst;
-
-#include "lazy_goto_model.h"
+#include <memory>
 
+#include <util/irep.h>
 
-class symbol_tablet;
-class goto_functionst;
+class languaget;
+class message_handlert;
+class optionst;
+class symbol_table_baset;
 
 #define OPT_FUNCTIONS \
   "(function):"
 
 #define HELP_FUNCTIONS \
   " --function name              set main function name\n"
 
-template<typename maybe_lazy_goto_modelt>
-class rebuild_goto_start_function_baset: public messaget
-{
-public:
-  rebuild_goto_start_function_baset(
-    const optionst &options,
-    maybe_lazy_goto_modelt &goto_model,
-    message_handlert &message_handler);
-
-  bool operator()();
-
-private:
-  irep_idt get_entry_point_mode() const;
-
-  const optionst &options;
-  maybe_lazy_goto_modelt &goto_model;
-};
-
 /// Eliminate the existing entry point function symbol and any symbols created
 /// in that scope from the \p symbol_table.
 void remove_existing_entry_point(symbol_table_baset &);
@@ -63,12 +45,4 @@ std::unique_ptr<languaget> get_entry_point_language(
   const optionst &options,
   message_handlert &message_handler);
 
-// NOLINTNEXTLINE(readability/namespace)  using required for templates
-using rebuild_goto_start_functiont =
-  rebuild_goto_start_function_baset<goto_modelt>;
-
-// NOLINTNEXTLINE(readability/namespace)  using required for templates
-using rebuild_lazy_goto_start_functiont =
-  rebuild_goto_start_function_baset<lazy_goto_modelt>;
-
 #endif // CPROVER_GOTO_PROGRAMS_REBUILD_GOTO_START_FUNCTION_H