Restore returns before writing the simplified binary

Not doing so would cause conflicts if later attempting to link additional
functions such as the C library.

Author: tautschnig

src/goto-analyzer/static_simplifier.cpp

@@ -12,6 +12,7 @@ Author: Martin Brain, [email protected]
 #include <util/options.h>
 
 #include <goto-programs/goto_model.h>
+#include <goto-programs/remove_returns.h>
 #include <goto-programs/remove_skip.h>
 #include <goto-programs/remove_unreachable.h>
 #include <goto-programs/write_goto_binary.h>
@@ -220,6 +221,10 @@ bool static_simplifier(
              << ", function calls: " << unmodified.function_calls
              << messaget::eom;
 
+  // restore return types before writing the binary
+  restore_returns(goto_model);
+  goto_model.goto_functions.update();
+
   m.status() << "Writing goto binary" << messaget::eom;
   return write_goto_binary(
     out, goto_model.get_symbol_table(), goto_model.goto_functions);