Restore returns before writing the simplified binary

The static simplifier should not alter types of symbols.  Doing so would cause
conflicts if later attempting to link additional functions such as the C library
as the types no longer match.

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>
@@ -169,6 +170,10 @@ bool static_simplifier(
     goto_model.goto_functions.update();
   }
 
+  // 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,
                            ns.get_symbol_table(),