Function-pointer remvoval: print human-friendly debug messages

Author: tautschnig

src/goto-programs/remove_const_function_pointers.cpp

@@ -12,15 +12,19 @@ Author: Thomas Kiley, [email protected]
 #include "remove_const_function_pointers.h"
 
 #include <util/arith_tools.h>
+#include <util/format_expr.h>
 #include <util/simplify_expr.h>
 #include <util/std_expr.h>
 #include <util/symbol_table.h>
 
 #include "goto_functions.h"
 
 #define LOG(message, irep) \
-  debug() << "Case " << __LINE__ << " : " << message << "\n" \
-          << irep.pretty() << eom;
+  do { \
+    debug().source_location = irep.source_location(); \
+    debug() << message << ": " << format(irep) << eom; \
+  } \
+  while(0)
 
 /// To take a function call on a function pointer, and if possible resolve it to
 /// a small collection of possible values.