Merge pull request #5790 from tautschnig/forall-operands

Replace some uses of forall_operands by ranged-for

Author: tautschnig

jbmc/src/java_bytecode/ci_lazy_methods.cpp

@@ -537,8 +537,10 @@ void ci_lazy_methodst::gather_needed_globals(
     }
   }
   else
-    forall_operands(opit, e)
-      gather_needed_globals(*opit, symbol_table, needed);
+  {
+    for(const auto &op : e.operands())
+      gather_needed_globals(op, symbol_table, needed);
+  }
 }
 
 /// Find a virtual callee, if one is defined and the callee type is known to

jbmc/src/java_bytecode/java_bytecode_convert_method.cpp

@@ -971,8 +971,8 @@ static void gather_symbol_live_ranges(
   }
   else
   {
-    forall_operands(it, e)
-      gather_symbol_live_ranges(pc, *it, result);
+    for(const auto &op : e.operands())
+      gather_symbol_live_ranges(pc, op, result);
   }
 }
 

jbmc/src/java_bytecode/java_bytecode_instrument.cpp

@@ -451,9 +451,9 @@ optionalt<codet> java_bytecode_instrumentt::instrument_expr(const exprt &expr)
 {
   code_blockt result;
   // First check our operands:
-  forall_operands(it, expr)
+  for(const auto &op : expr.operands())
   {
-    if(optionalt<codet> op_result = instrument_expr(*it))
+    if(optionalt<codet> op_result = instrument_expr(op))
       result.add(std::move(*op_result));
   }
 

src/analyses/constant_propagator.cpp

@@ -324,9 +324,9 @@ bool constant_propagator_domaint::two_way_propagate_rec(
     {
       change_this_time = false;
 
-      forall_operands(it, expr)
+      for(const auto &op : expr.operands())
       {
-        change_this_time |= two_way_propagate_rec(*it, ns, cp);
+        change_this_time |= two_way_propagate_rec(op, ns, cp);
         if(change_this_time)
           change = true;
       }

src/analyses/custom_bitvector_analysis.cpp

@@ -687,9 +687,11 @@ bool custom_bitvector_domaint::has_get_must_or_may(const exprt &src)
   if(src.id() == ID_get_must || src.id() == ID_get_may)
     return true;
 
-  forall_operands(it, src)
-    if(has_get_must_or_may(*it))
+  for(const auto &op : src.operands())
+  {
+    if(has_get_must_or_may(op))
       return true;
+  }
 
   return false;
 }

src/analyses/dirty.cpp

@@ -44,8 +44,8 @@ void dirtyt::search_other(const goto_programt::instructiont &instruction)
       statement == ID_array_replace || statement == ID_havoc_object ||
       statement == ID_input || statement == ID_output)
     {
-      forall_operands(it, code)
-        find_dirty(*it);
+      for(const auto &op : code.operands())
+        find_dirty(op);
     }
     // other possible cases according to goto_programt::instructiont::output
     // and goto_symext::symex_other:
@@ -66,8 +66,8 @@ void dirtyt::find_dirty(const exprt &expr)
     return;
   }
 
-  forall_operands(it, expr)
-    find_dirty(*it);
+  for(const auto &op : expr.operands())
+    find_dirty(op);
 }
 
 void dirtyt::find_dirty_address_of(const exprt &expr)

src/analyses/goto_rw.cpp

@@ -330,8 +330,8 @@ void rw_range_sett::get_objects_array(
 
   if(!subtype_bits.has_value())
   {
-    forall_operands(it, expr)
-      get_objects_rec(mode, *it, range_spect{0}, range_spect::unknown());
+    for(const auto &op : expr.operands())
+      get_objects_rec(mode, op, range_spect{0}, range_spect::unknown());
 
     return;
   }
@@ -346,7 +346,7 @@ void rw_range_sett::get_objects_array(
       ? sub_size * range_spect::to_range_spect(expr.operands().size())
       : full_r_s + size;
 
-  forall_operands(it, expr)
+  for(const auto &op : expr.operands())
   {
     if(full_r_s<=offset+sub_size && full_r_e>offset)
     {
@@ -355,7 +355,7 @@ void rw_range_sett::get_objects_array(
       range_spect cur_r_e=
         full_r_e>offset+sub_size ? sub_size : full_r_e-offset;
 
-      get_objects_rec(mode, *it, cur_r_s, cur_r_e-cur_r_s);
+      get_objects_rec(mode, op, cur_r_s, cur_r_e - cur_r_s);
     }
 
     offset+=sub_size;
@@ -384,17 +384,17 @@ void rw_range_sett::get_objects_struct(
                            ? range_spect::unknown()
                            : full_r_s + size;
 
-  forall_operands(it, expr)
+  for(const auto &op : expr.operands())
   {
-    auto it_bits = pointer_offset_bits(it->type(), ns);
+    auto it_bits = pointer_offset_bits(op.type(), ns);
 
     range_spect sub_size = it_bits.has_value()
                              ? range_spect::to_range_spect(*it_bits)
                              : range_spect::unknown();
 
     if(offset.is_unknown())
     {
-      get_objects_rec(mode, *it, range_spect{0}, sub_size);
+      get_objects_rec(mode, op, range_spect{0}, sub_size);
     }
     else if(sub_size.is_unknown())
     {
@@ -403,7 +403,7 @@ void rw_range_sett::get_objects_struct(
         range_spect cur_r_s =
           full_r_s <= offset ? range_spect{0} : full_r_s - offset;
 
-        get_objects_rec(mode, *it, cur_r_s, range_spect::unknown());
+        get_objects_rec(mode, op, cur_r_s, range_spect::unknown());
       }
 
       offset = range_spect::unknown();
@@ -415,7 +415,7 @@ void rw_range_sett::get_objects_struct(
         range_spect cur_r_s =
           full_r_s <= offset ? range_spect{0} : full_r_s - offset;
 
-        get_objects_rec(mode, *it, cur_r_s, sub_size-cur_r_s);
+        get_objects_rec(mode, op, cur_r_s, sub_size - cur_r_s);
       }
 
       offset+=sub_size;
@@ -427,7 +427,7 @@ void rw_range_sett::get_objects_struct(
       range_spect cur_r_e=
         full_r_e>offset+sub_size ? sub_size : full_r_e-offset;
 
-      get_objects_rec(mode, *it, cur_r_s, cur_r_e-cur_r_s);
+      get_objects_rec(mode, op, cur_r_s, cur_r_e - cur_r_s);
 
       offset+=sub_size;
     }
@@ -619,8 +619,8 @@ void rw_range_sett::get_objects_rec(
     // possibly affects the full object size, even if range_start/size
     // are only a subset of the bytes (e.g., when using the result of
     // arithmetic operations)
-    forall_operands(it, expr)
-      get_objects_rec(mode, *it);
+    for(const auto &op : expr.operands())
+      get_objects_rec(mode, op);
   }
   else if(expr.id() == ID_null_object ||
           expr.id() == ID_string_constant)
@@ -629,8 +629,8 @@ void rw_range_sett::get_objects_rec(
   }
   else if(mode==get_modet::LHS_W)
   {
-    forall_operands(it, expr)
-      get_objects_rec(mode, *it);
+    for(const auto &op : expr.operands())
+      get_objects_rec(mode, op);
   }
   else
     throw "rw_range_sett: assignment to '" + expr.id_string() + "' not handled";

src/analyses/interval_domain.cpp

@@ -390,14 +390,18 @@ void interval_domaint::assume_rec(
   else if(cond.id()==ID_and)
   {
     if(!negation)
-      forall_operands(it, cond)
-        assume_rec(*it, false);
+    {
+      for(const auto &op : cond.operands())
+        assume_rec(op, false);
+    }
   }
   else if(cond.id()==ID_or)
   {
     if(negation)
-      forall_operands(it, cond)
-        assume_rec(*it, true);
+    {
+      for(const auto &op : cond.operands())
+        assume_rec(op, true);
+    }
   }
 }
 

src/analyses/invariant_set.cpp

@@ -409,8 +409,8 @@ void invariant_sett::strengthen_rec(const exprt &expr)
   }
   else if(expr.id()==ID_and)
   {
-    forall_operands(it, expr)
-      strengthen_rec(*it);
+    for(const auto &op : expr.operands())
+      strengthen_rec(op);
   }
   else if(expr.id()==ID_le ||
           expr.id()==ID_lt)
@@ -424,10 +424,10 @@ void invariant_sett::strengthen_rec(const exprt &expr)
     {
       const exprt &bitand_op = rel.op1();
 
-      forall_operands(it, bitand_op)
+      for(const auto &op : bitand_op.operands())
       {
         auto tmp(rel);
-        tmp.op1()=*it;
+        tmp.op1() = op;
         strengthen_rec(tmp);
       }
 
@@ -499,10 +499,10 @@ void invariant_sett::strengthen_rec(const exprt &expr)
     {
       const exprt &bitand_op = equal_expr.op1();
 
-      forall_operands(it, bitand_op)
+      for(const auto &op : bitand_op.operands())
       {
         auto tmp(equal_expr);
-        tmp.op1()=*it;
+        tmp.op1() = op;
         tmp.id(ID_le);
         strengthen_rec(tmp);
       }
@@ -602,17 +602,21 @@ tvt invariant_sett::implies_rec(const exprt &expr) const
   }
   else if(expr.id()==ID_and)
   {
-    forall_operands(it, expr)
-      if(implies_rec(*it)!=tvt(true))
+    for(const auto &op : expr.operands())
+    {
+      if(implies_rec(op) != tvt(true))
         return tvt::unknown();
+    }
 
     return tvt(true);
   }
   else if(expr.id()==ID_or)
   {
-    forall_operands(it, expr)
-      if(implies_rec(*it)==tvt(true))
+    for(const auto &op : expr.operands())
+    {
+      if(implies_rec(op) == tvt(true))
         return tvt(true);
+    }
   }
   else if(expr.id()==ID_le ||
           expr.id()==ID_lt ||
@@ -1049,8 +1053,8 @@ void invariant_sett::apply_code(const codet &code)
 
   if(statement==ID_block)
   {
-    forall_operands(it, code)
-      apply_code(to_code(*it));
+    for(const auto &op : code.operands())
+      apply_code(to_code(op));
   }
   else if(statement==ID_assign)
   {

src/ansi-c/ansi_c_convert_type.cpp

@@ -202,17 +202,17 @@ void ansi_c_convert_typet::read_rec(const typet &type)
     const exprt &as_expr=
       static_cast<const exprt &>(static_cast<const irept &>(type));
 
-    forall_operands(it, as_expr)
+    for(const auto &op : as_expr.operands())
     {
       // these are symbols
-      const irep_idt &id=it->get(ID_identifier);
+      const irep_idt &id = op.get(ID_identifier);
 
       if(id==ID_thread)
         c_storage_spec.is_thread_local=true;
       else if(id=="align")
       {
         aligned=true;
-        alignment = to_unary_expr(*it).op();
+        alignment = to_unary_expr(op).op();
       }
     }
   }

src/ansi-c/c_storage_spec.cpp

@@ -42,9 +42,11 @@ void c_storage_spect::read(const typet &type)
   {
     const exprt &as_expr=
       static_cast<const exprt &>(static_cast<const irept &>(type));
-    forall_operands(it, as_expr)
-      if(it->id()==ID_thread)
+    for(const auto &op : as_expr.operands())
+    {
+      if(op.id() == ID_thread)
         is_thread_local=true;
+    }
   }
   else if(
     type.id() == ID_alias && type.has_subtype() &&

src/ansi-c/c_typecheck_expr.cpp

@@ -584,15 +584,15 @@ void c_typecheck_baset::typecheck_expr_builtin_offsetof(exprt &expr)
   typet &type=static_cast<typet &>(expr.add(ID_type_arg));
   typecheck_type(type);
 
-  exprt &member=static_cast<exprt &>(expr.add(ID_designator));
+  const exprt &member = static_cast<const exprt &>(expr.add(ID_designator));
 
   exprt result=from_integer(0, size_type());
 
-  forall_operands(m_it, member)
+  for(const auto &op : member.operands())
   {
     type = follow(type);
 
-    if(m_it->id()==ID_member)
+    if(op.id() == ID_member)
     {
       if(type.id()!=ID_union && type.id()!=ID_struct)
       {
@@ -603,7 +603,7 @@ void c_typecheck_baset::typecheck_expr_builtin_offsetof(exprt &expr)
       }
 
       bool found=false;
-      irep_idt component_name=m_it->get(ID_component_name);
+      irep_idt component_name = op.get(ID_component_name);
 
       while(!found)
       {
@@ -689,7 +689,7 @@ void c_typecheck_baset::typecheck_expr_builtin_offsetof(exprt &expr)
         }
       }
     }
-    else if(m_it->id()==ID_index)
+    else if(op.id() == ID_index)
     {
       if(type.id()!=ID_array)
       {
@@ -698,7 +698,7 @@ void c_typecheck_baset::typecheck_expr_builtin_offsetof(exprt &expr)
         throw 0;
       }
 
-      exprt index = to_unary_expr(*m_it).op();
+      exprt index = to_unary_expr(op).op();
 
       // still need to typecheck index
       typecheck_expr(index);

src/ansi-c/c_typecheck_initializer.cpp

@@ -775,9 +775,8 @@ designatort c_typecheck_baset::make_designator(
   typet type=src_type;
   designatort designator;
 
-  forall_operands(it, src)
+  for(const auto &d_op : src.operands())
   {
-    const exprt &d_op=*it;
     designatort::entryt entry(type);
     const typet &full_type=follow(entry.type);