Merge pull request diffblue#99 from diffblue/nathan/feature/merge-master

Update to work with latest changes to master

Author: NathanJPhillips

cbmc

@@ -311,7 +311,10 @@ bool sec_driver_parse_optionst::process_goto_program(
 
     // remove function pointers
     status() << "Removing function pointers and virtual functions" << eom;
-    remove_function_pointers(goto_model, cmdline.isset("pointer-check"));
+    remove_function_pointers(
+      get_message_handler(),
+      goto_model,
+      cmdline.isset("pointer-check"));
     remove_virtual_functions(goto_model);
     // remove rtti
     remove_instanceof(goto_model);

src/driver/sec_driver_parse_options.cpp

@@ -171,7 +171,7 @@ void local_value_sett::get_value_set_rec(
       // Override how malloc finds its type:
       exprt malloc_copy=expr;
       assert(expr.type().id()==ID_pointer && "non-pointer-typed malloc?");
-      malloc_copy.set("#type", expr.type().subtype());
+      malloc_copy.set(ID_C_cxx_alloc_type, expr.type().subtype());
       baset::get_value_set_rec(malloc_copy, dest, suffix, original_type, ns);
       return;
     }
@@ -250,7 +250,7 @@ void local_value_sett::apply_side_effects(
     rhs.get(ID_statement)==ID_malloc)
   {
     const typet &dynamic_type=
-      static_cast<const typet &>(rhs.find("#type"));
+      static_cast<const typet &>(rhs.find(ID_C_cxx_alloc_type));
 
     // Replace all the current most-recent-allocation dynamic-objects
     // with the corresponding any-allocation ones