Merge pull request diffblue#3145 from smowton/smowton/cleanup/replace-symbol-interface-2

tautschnig · web-flow · commit db7f8604680f · 2018-10-11T19:12:25.000+01:00
replace_symbolt: avoid a couple of direct references to expr_map
diff --git a/src/util/replace_symbol.cpp b/src/util/replace_symbol.cpp
@@ -119,7 +119,7 @@ bool replace_symbolt::replace(exprt &dest) const
 
 bool replace_symbolt::have_to_replace(const exprt &dest) const
 {
-  if(expr_map.empty())
+  if(empty())
     return false;
 
   // first look at type
@@ -132,7 +132,7 @@ bool replace_symbolt::have_to_replace(const exprt &dest) const
   if(dest.id()==ID_symbol)
   {
     const irep_idt &identifier = to_symbol_expr(dest).get_identifier();
-    return expr_map.find(identifier) != expr_map.end();
+    return replaces_symbol(identifier);
   }
 
   forall_operands(it, dest)

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ bool replace_symbolt::replace(exprt &dest) const`
`119`	`119`
`120`	`120`	`bool replace_symbolt::have_to_replace(const exprt &dest) const`
`121`	`121`	`{`
`122`		`- if(expr_map.empty())`
	`122`	`+ if(empty())`
`123`	`123`	`return false;`
`124`	`124`
`125`	`125`	`// first look at type`
`@@ -132,7 +132,7 @@ bool replace_symbolt::have_to_replace(const exprt &dest) const`
`132`	`132`	`if(dest.id()==ID_symbol)`
`133`	`133`	`{`
`134`	`134`	`const irep_idt &identifier = to_symbol_expr(dest).get_identifier();`
`135`		`- return expr_map.find(identifier) != expr_map.end();`
	`135`	`+ return replaces_symbol(identifier);`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`forall_operands(it, dest)`