Adapt to upstream change in write_goto_binary interface and languaget

* write_goto_binary now takes a goto_modelt
* languaget now uses the override keyword

Author: smowton

cbmc/src/jsil/jsil_language.h

@@ -55,7 +55,7 @@ class jsil_languaget:public languaget
     const namespacet &ns) override;
 
   std::unique_ptr<pretty_printert>
-    get_pretty_printer(const namespacet &);
+    get_pretty_printer(const namespacet &) override;
 
   virtual bool to_expr(
     const std::string &code,

src/taint-slicer/slicing_tasks_builder.cpp

@@ -150,8 +150,10 @@ std::pair<taint_slicing_taskt,std::string> build_slicing_task(
   {
     // First we copy data from the instrumenter to the resuling structures
     // (because we want to attach more data - symbols and functions).
-    symbol_tablet symbol_table=instrumenter.get_instrumented_symbol_table();
-    goto_functionst goto_functions;
+    goto_modelt goto_model;
+    goto_model.symbol_table=instrumenter.get_instrumented_symbol_table();
+    symbol_tablet &symbol_table=goto_model.symbol_table;
+    goto_functionst &goto_functions=goto_model.goto_functions;
     for(const auto &fname_fn :
         instrumenter.get_instrumented_functions().function_map)
     {
@@ -306,8 +308,7 @@ std::pair<taint_slicing_taskt,std::string> build_slicing_task(
     // binary.
     const bool fail=write_goto_binary(
       pathname,
-      symbol_table,
-      goto_functions,
+      goto_model,
       logger->get_message_handler());
     if(fail)
       fail_message="Not available.";