remove_const_function_pointerst::functionst only holds symbol expressions

tautschnig · tautschnig · commit 07ef32da141f · 2018-06-04T17:49:29.000Z
diff --git a/src/goto-programs/remove_const_function_pointers.cpp b/src/goto-programs/remove_const_function_pointers.cpp
@@ -160,7 +160,7 @@ bool remove_const_function_pointerst::try_resolve_function_call(
   {
     if(simplified_expr.type().id()==ID_code)
     {
-      resolved_functions.insert(simplified_expr);
+      resolved_functions.insert(to_symbol_expr(simplified_expr));
       resolved=true;
     }
     else
diff --git a/src/goto-programs/remove_const_function_pointers.h b/src/goto-programs/remove_const_function_pointers.h
@@ -32,7 +32,7 @@ class typecast_exprt;
 class remove_const_function_pointerst:public messaget
 {
 public:
-  typedef std::unordered_set<exprt, irep_hash> functionst;
+  typedef std::unordered_set<symbol_exprt, irep_hash> functionst;
   typedef std::list<exprt> expressionst;
   remove_const_function_pointerst(
     message_handlert &message_handler,

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ bool remove_const_function_pointerst::try_resolve_function_call(`
`160`	`160`	`{`
`161`	`161`	`if(simplified_expr.type().id()==ID_code)`
`162`	`162`	`{`
`163`		`- resolved_functions.insert(simplified_expr);`
	`163`	`+ resolved_functions.insert(to_symbol_expr(simplified_expr));`
`164`	`164`	`resolved=true;`
`165`	`165`	`}`
`166`	`166`	`else`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class typecast_exprt;`
`32`	`32`	`class remove_const_function_pointerst:public messaget`
`33`	`33`	`{`
`34`	`34`	`public:`
`35`		`- typedef std::unordered_set<exprt, irep_hash> functionst;`
	`35`	`+ typedef std::unordered_set<symbol_exprt, irep_hash> functionst;`
`36`	`36`	`typedef std::list<exprt> expressionst;`
`37`	`37`	`remove_const_function_pointerst(`
`38`	`38`	`message_handlert &message_handler,`