use instructiont::apply

Author: Daniel Kroening

src/goto-programs/compute_called_functions.cpp

@@ -54,13 +54,8 @@ void compute_address_taken_functions(
   const goto_programt &goto_program,
   std::unordered_set<irep_idt> &address_taken)
 {
-  forall_goto_program_instructions(it, goto_program)
-  {
-    if(it->has_condition())
-      compute_address_taken_functions(it->get_condition(), address_taken);
-
-    compute_address_taken_functions(it->code, address_taken);
-  }
+  for(const auto &i : goto_program.instructions)
+    i.apply([&address_taken](const exprt &expr) { compute_address_taken_functions(expr, address_taken); });
 }
 
 /// get all functions whose address is taken

src/goto-programs/slice_global_inits.cpp

@@ -61,22 +61,15 @@ void slice_global_inits(goto_modelt &goto_model)
     if(it == goto_functions.function_map.end())
       continue;
 
-    const goto_programt &goto_program = it->second.body;
-
-    forall_goto_program_instructions(i_it, goto_program)
-    {
-      const codet &code = i_it->code;
-      find_symbols(code, symbols, true, false);
-
-      if(i_it->has_condition())
-        find_symbols(i_it->get_condition(), symbols, true, false);
-    }
+    for(const auto &i : it->second.body.instructions)
+      i.apply([&symbols](const exprt &expr) { find_symbols(expr, symbols, true, false); });
   }
 
   // now remove unnecessary initializations
 
   goto_functionst::function_mapt::iterator f_it;
   f_it=goto_functions.function_map.find(INITIALIZE_FUNCTION);
+
   if(f_it == goto_functions.function_map.end())
     throw incorrect_goto_program_exceptiont("initialize function not found");