function-pointer-removal: drop unused set

nmanthey · nmanthey · commit 026e93f0078e · 2018-05-29T15:15:58.000+02:00
The compute_called_functions method maintains two sets, 'done' and 'functions'. The set 'done' is only used to determine whether an element can be skipped. Since the content of the two sets is the same, the set 'done' can be dropped, and 'functions' can be used instead. Hence, this commit drops the set 'done'. Furthermore, the return value of insert includes a bool that indicates the success of the insert operation. In case insertion failed, the element has been present already, so that we can merge the find+insert into a single insert operation. Fixes: diffblue#1783
diff --git a/src/goto-programs/compute_called_functions.cpp b/src/goto-programs/compute_called_functions.cpp
@@ -80,7 +80,6 @@ std::set<irep_idt> compute_called_functions(
   const goto_functionst &goto_functions)
 {
   std::set<irep_idt> working_queue;
-  std::set<irep_idt> done;
   std::set<irep_idt> functions;
 
   // start from entry point
@@ -91,12 +90,9 @@ std::set<irep_idt> compute_called_functions(
     irep_idt id=*working_queue.begin();
     working_queue.erase(working_queue.begin());
 
-    if(done.find(id)!=done.end())
+    if(!functions.insert(id).second)
       continue;
 
-    functions.insert(id);
-    done.insert(id);
-
     const goto_functionst::function_mapt::const_iterator f_it=
       goto_functions.function_map.find(id);
 
