Merge pull request #741 from tautschnig/fct-ptr-stats

Provide statistics of function-pointer removal

Author: Daniel Kroening

src/goto-programs/remove_function_pointers.cpp

@@ -503,6 +503,11 @@ void remove_function_pointerst::remove_function_pointer(
   code_expression.expression()=function;
   target->code.swap(code_expression);
   target->type=OTHER;
+
+  // report statistics
+  statistics().source_location=target->source_location;
+  statistics() << "replacing function pointer by "
+               << functions.size() << " possible targets" << eom;
 }
 
 /*******************************************************************\

src/musketeer/musketeer_parse_options.cpp

@@ -244,14 +244,11 @@ void goto_fence_inserter_parse_optionst::instrument_goto_program(
     // return;
 #if 0
     status() << "Function Pointer Removal" << eom;
-    remove_function_pointers(symbol_table, goto_functions,
-      cmdline.isset("pointer-check"));
-#endif
-
-#if 0
-    // do partial inlining
-    status() << "Partial Inlining" << eom;
-    goto_partial_inline(goto_functions, ns, ui_message_handler);
+    remove_function_pointers(
+      get_message_handler(),
+      symbol_table,
+      goto_functions,
+      cmdline.isset("pointer-check");
 #endif
 
     status() << "Pointer Analysis" << eom;