Replace some uses of {f,F}orall_goto_program_instructions by ranged-for

In some (but not all!) cases of {f,F}orall_goto_program_instructions we do not
actually need the iterator.

Author: tautschnig

jbmc/src/java_bytecode/remove_exceptions.cpp

@@ -190,17 +190,17 @@ symbol_exprt remove_exceptionst::get_inflight_exception_global()
 bool remove_exceptionst::function_or_callees_may_throw(
   const goto_programt &goto_program) const
 {
-  forall_goto_program_instructions(instr_it, goto_program)
+  for(const auto &instruction : goto_program.instructions)
   {
-    if(instr_it->is_throw())
+    if(instruction.is_throw())
     {
       return true;
     }
 
-    if(instr_it->is_function_call())
+    if(instruction.is_function_call())
     {
-      const exprt &function_expr=
-        to_code_function_call(instr_it->code).function();
+      const exprt &function_expr =
+        to_code_function_call(instruction.code).function();
       DATA_INVARIANT(
         function_expr.id()==ID_symbol,
         "identifier expected to be a symbol");

src/analyses/goto_check.cpp

@@ -290,9 +290,9 @@ void goto_checkt::collect_allocations(
     return;
 
   forall_goto_functions(itf, goto_functions)
-    forall_goto_program_instructions(it, itf->second.body)
+  {
+    for(const auto &instruction : itf->second.body.instructions)
     {
-      const goto_programt::instructiont &instruction=*it;
       if(!instruction.is_function_call())
         continue;
 
@@ -313,6 +313,7 @@ void goto_checkt::collect_allocations(
       assert(args[0].type()==args[1].type());
       allocations.push_back({args[0], args[1]});
     }
+  }
 }
 
 void goto_checkt::invalidate(const exprt &lhs)
@@ -2092,28 +2093,33 @@ void goto_checkt::goto_check(
       }
     }
 
-    Forall_goto_program_instructions(i_it, new_code)
+    for(auto &instruction : new_code.instructions)
     {
-      if(i_it->source_location.is_nil())
+      if(instruction.source_location.is_nil())
       {
-        i_it->source_location.id(irep_idt());
+        instruction.source_location.id(irep_idt());
 
         if(!it->source_location.get_file().empty())
-          i_it->source_location.set_file(it->source_location.get_file());
+          instruction.source_location.set_file(it->source_location.get_file());
 
         if(!it->source_location.get_line().empty())
-          i_it->source_location.set_line(it->source_location.get_line());
+          instruction.source_location.set_line(it->source_location.get_line());
 
         if(!it->source_location.get_function().empty())
-          i_it->source_location.set_function(
+          instruction.source_location.set_function(
             it->source_location.get_function());
 
         if(!it->source_location.get_column().empty())
-          i_it->source_location.set_column(it->source_location.get_column());
+        {
+          instruction.source_location.set_column(
+            it->source_location.get_column());
+        }
 
         if(!it->source_location.get_java_bytecode_index().empty())
-          i_it->source_location.set_java_bytecode_index(
+        {
+          instruction.source_location.set_java_bytecode_index(
             it->source_location.get_java_bytecode_index());
+        }
       }
     }
 

src/analyses/local_bitvector_analysis.cpp

@@ -363,9 +363,9 @@ void local_bitvector_analysist::output(
 {
   unsigned l=0;
 
-  forall_goto_program_instructions(i_it, goto_function.body)
+  for(const auto &instruction : goto_function.body.instructions)
   {
-    out << "**** " << i_it->source_location << "\n";
+    out << "**** " << instruction.source_location << "\n";
 
     const auto &loc_info=loc_infos[l];
 
@@ -381,7 +381,7 @@ void local_bitvector_analysist::output(
     }
 
     out << "\n";
-    goto_function.body.output_instruction(ns, irep_idt(), out, *i_it);
+    goto_function.body.output_instruction(ns, irep_idt(), out, instruction);
     out << "\n";
 
     l++;

src/analyses/local_may_alias.cpp

@@ -474,9 +474,9 @@ void local_may_aliast::output(
 {
   unsigned l=0;
 
-  forall_goto_program_instructions(i_it, goto_function.body)
+  for(const auto &instruction : goto_function.body.instructions)
   {
-    out << "**** " << i_it->source_location << "\n";
+    out << "**** " << instruction.source_location << "\n";
 
     const loc_infot &loc_info=loc_infos[l];
 
@@ -502,7 +502,7 @@ void local_may_aliast::output(
     }
 
     out << "\n";
-    goto_function.body.output_instruction(ns, irep_idt(), out, *i_it);
+    goto_function.body.output_instruction(ns, irep_idt(), out, instruction);
     out << "\n";
 
     l++;

src/analyses/local_safe_pointers.cpp

@@ -191,14 +191,14 @@ void local_safe_pointerst::output(
   const goto_programt &goto_program,
   const namespacet &ns)
 {
-  forall_goto_program_instructions(i_it, goto_program)
+  for(const auto &instruction : goto_program.instructions)
   {
-    out << "**** " << i_it->location_number << " "
-        << i_it->source_location << "\n";
+    out << "**** " << instruction.location_number << " "
+        << instruction.source_location << "\n";
 
     out << "Non-null expressions: ";
 
-    auto findit = non_null_expressions.find(i_it->location_number);
+    auto findit = non_null_expressions.find(instruction.location_number);
     if(findit == non_null_expressions.end())
       out << "{}";
     else
@@ -216,7 +216,7 @@ void local_safe_pointerst::output(
     }
 
     out << '\n';
-    goto_program.output_instruction(ns, irep_idt(), out, *i_it);
+    goto_program.output_instruction(ns, irep_idt(), out, instruction);
     out << '\n';
   }
 }
@@ -235,21 +235,21 @@ void local_safe_pointerst::output_safe_dereferences(
   const goto_programt &goto_program,
   const namespacet &ns)
 {
-  forall_goto_program_instructions(i_it, goto_program)
+  for(const auto &instruction : goto_program.instructions)
   {
-    out << "**** " << i_it->location_number << " "
-        << i_it->source_location << "\n";
+    out << "**** " << instruction.location_number << " "
+        << instruction.source_location << "\n";
 
     out << "Safe (known-not-null) dereferences: ";
 
-    auto findit = non_null_expressions.find(i_it->location_number);
+    auto findit = non_null_expressions.find(instruction.location_number);
     if(findit == non_null_expressions.end())
       out << "{}";
     else
     {
       out << "{";
       bool first = true;
-      i_it->apply([&first, &out](const exprt &e) {
+      instruction.apply([&first, &out](const exprt &e) {
         for(auto subexpr_it = e.depth_begin(), subexpr_end = e.depth_end();
             subexpr_it != subexpr_end;
             ++subexpr_it)
@@ -267,7 +267,7 @@ void local_safe_pointerst::output_safe_dereferences(
     }
 
     out << '\n';
-    goto_program.output_instruction(ns, irep_idt(), out, *i_it);
+    goto_program.output_instruction(ns, irep_idt(), out, instruction);
     out << '\n';
   }
 }

src/analyses/locals.cpp

@@ -17,10 +17,10 @@ Date: March 2013
 
 void localst::build(const goto_functiont &goto_function)
 {
-  forall_goto_program_instructions(it, goto_function.body)
+  for(const auto &instruction : goto_function.body.instructions)
   {
-    if(it->is_decl())
-      locals.insert(it->get_decl().get_identifier());
+    if(instruction.is_decl())
+      locals.insert(instruction.get_decl().get_identifier());
   }
 
   locals.insert(

src/goto-cc/linker_script_merge.cpp

@@ -259,9 +259,10 @@ int linker_script_merget::pointerize_linker_defined_symbols(
   for(auto &gf : goto_model.goto_functions.function_map)
   {
     goto_programt &program=gf.second.body;
-    Forall_goto_program_instructions(iit, program)
+    for(auto &instruction : program.instructions)
     {
-      for(exprt *insts : std::list<exprt *>({&(iit->code), &(iit->guard)}))
+      for(exprt *insts :
+          std::list<exprt *>({&(instruction.code), &(instruction.guard)}))
       {
         std::list<symbol_exprt> to_pointerize;
         symbols_to_pointerize(linker_values, *insts, to_pointerize);
@@ -277,7 +278,7 @@ int linker_script_merget::pointerize_linker_defined_symbols(
           log.error() << " Could not pointerize '" << sym.get_identifier()
                       << "' in function " << gf.first << ". Pretty:\n"
                       << sym.pretty() << "\n";
-          log.error().source_location = iit->source_location;
+          log.error().source_location = instruction.source_location;
         }
         log.error() << messaget::eom;
       }

src/goto-instrument/accelerate/disjunctive_polynomial_acceleration.cpp

@@ -858,11 +858,11 @@ void disjunctive_polynomial_accelerationt::build_fixed()
 
   fixed.copy_from(goto_program);
 
-  Forall_goto_program_instructions(it, fixed)
+  for(auto &instruction : fixed.instructions)
   {
-    if(it->is_assert())
+    if(instruction.is_assert())
     {
-      it->type=ASSUME;
+      instruction.type = ASSUME;
     }
   }
 

src/goto-instrument/accelerate/sat_path_enumerator.cpp

@@ -216,10 +216,10 @@ void sat_path_enumeratort::build_fixed()
 
   fixed.copy_from(goto_program);
 
-  Forall_goto_program_instructions(it, fixed)
+  for(auto &instruction : fixed.instructions)
   {
-    if(it->is_assert())
-      it->type=ASSUME;
+    if(instruction.is_assert())
+      instruction.type = ASSUME;
   }
 
   // We're only interested in paths that loop back to the loop header.

src/goto-instrument/call_sequences.cpp

@@ -272,12 +272,12 @@ static void list_calls_and_arguments(
   const namespacet &ns,
   const goto_programt &goto_program)
 {
-  forall_goto_program_instructions(i_it, goto_program)
+  for(const auto &instruction : goto_program.instructions)
   {
-    if(!i_it->is_function_call())
+    if(!instruction.is_function_call())
       continue;
 
-    const code_function_callt &call = to_code_function_call(i_it->code);
+    const code_function_callt &call = to_code_function_call(instruction.code);
 
     const exprt &f=call.function();