use instructiont::apply

Author: Daniel Kroening

src/analyses/local_safe_pointers.cpp

@@ -11,6 +11,7 @@ Author: Diffblue Ltd
 
 #include "local_safe_pointers.h"
 
+#include <util/base_type.h>
 #include <util/expr_iterator.h>
 #include <util/expr_util.h>
 #include <util/format_expr.h>
@@ -81,7 +82,8 @@ static optionalt<goto_null_checkt> get_null_checked_expr(const exprt &expr)
 /// \param goto_program: program to analyse
 void local_safe_pointerst::operator()(const goto_programt &goto_program)
 {
-  std::set<exprt, type_comparet> checked_expressions(type_comparet{});
+  std::set<exprt, base_type_comparet> checked_expressions(
+    base_type_comparet{ns});
 
   for(const auto &instruction : goto_program.instructions)
   {
@@ -96,7 +98,8 @@ void local_safe_pointerst::operator()(const goto_programt &goto_program)
         checked_expressions = findit->second;
       else
       {
-        checked_expressions = std::set<exprt, type_comparet>(type_comparet{});
+        checked_expressions =
+          std::set<exprt, base_type_comparet>(base_type_comparet{ns});
       }
     }
 
@@ -176,11 +179,8 @@ void local_safe_pointerst::operator()(const goto_programt &goto_program)
 /// \param out: stream to write output to
 /// \param goto_program: GOTO program analysed (the same one passed to
 ///   operator())
-/// \param ns: namespace
 void local_safe_pointerst::output(
-  std::ostream &out,
-  const goto_programt &goto_program,
-  const namespacet &ns)
+  std::ostream &out, const goto_programt &goto_program)
 {
   forall_goto_program_instructions(i_it, goto_program)
   {
@@ -220,11 +220,8 @@ void local_safe_pointerst::output(
 /// \param out: stream to write output to
 /// \param goto_program: GOTO program analysed (the same one passed to
 ///   operator())
-/// \param ns: namespace
 void local_safe_pointerst::output_safe_dereferences(
-  std::ostream &out,
-  const goto_programt &goto_program,
-  const namespacet &ns)
+  std::ostream &out, const goto_programt &goto_program)
 {
   forall_goto_program_instructions(i_it, goto_program)
   {
@@ -241,17 +238,12 @@ void local_safe_pointerst::output_safe_dereferences(
       out << "{";
       bool first = true;
       i_it->apply([&first, &out](const exprt &e) {
-        for(auto subexpr_it = e.depth_begin(), subexpr_end = e.depth_end();
-            subexpr_it != subexpr_end;
-            ++subexpr_it)
+        if(e.id() == ID_dereference)
         {
-          if(subexpr_it->id() == ID_dereference)
-          {
-            if(!first)
-              out << ", ";
-            first = true;
-            format_rec(out, to_dereference_expr(*subexpr_it).pointer());
-          }
+          if(!first)
+            out << ", ";
+          first = true;
+          format_rec(out, to_dereference_expr(e).pointer());
         }
       });
       out << "}";
@@ -272,6 +264,17 @@ bool local_safe_pointerst::is_non_null_at_program_point(
   auto findit = non_null_expressions.find(program_point->location_number);
   if(findit == non_null_expressions.end())
     return false;
+  const exprt *tocheck = &expr;
+  while(tocheck->id() == ID_typecast)
+    tocheck = &tocheck->op0();
+  return findit->second.count(*tocheck) != 0;
+}
 
-  return findit->second.count(skip_typecast(expr)) != 0;
+bool local_safe_pointerst::base_type_comparet::operator()(
+  const exprt &e1, const exprt &e2) const
+{
+  if(base_type_eq(e1, e2, ns))
+    return false;
+  else
+    return e1 < e2;
 }

src/goto-instrument/cover_util.cpp

@@ -48,22 +48,11 @@ std::set<exprt> collect_conditions(const exprt &src)
 
 std::set<exprt> collect_conditions(const goto_programt::const_targett t)
 {
-  switch(t->type)
-  {
-  case GOTO:
-  case ASSERT:
-    return collect_conditions(t->guard);
+  std::set<exprt> result;
 
-  case ASSIGN:
-  case FUNCTION_CALL:
-    return collect_conditions(t->code);
+  t->apply([&result](const exprt &e) { collect_conditions_rec(e, result); });
 
-  default:
-  {
-  }
-  }
-
-  return std::set<exprt>();
+  return result;
 }
 
 void collect_operands(const exprt &src, std::vector<exprt> &dest)
@@ -115,20 +104,9 @@ std::set<exprt> collect_decisions(const exprt &src)
 
 std::set<exprt> collect_decisions(const goto_programt::const_targett t)
 {
-  switch(t->type)
-  {
-  case GOTO:
-  case ASSERT:
-    return collect_decisions(t->guard);
+  std::set<exprt> result;
 
-  case ASSIGN:
-  case FUNCTION_CALL:
-    return collect_decisions(t->code);
+  t->apply([&result](const exprt &e) { collect_decisions_rec(e, result); });
 
-  default:
-  {
-  }
-  }
-
-  return std::set<exprt>();
+  return result;
 }

src/goto-programs/compute_called_functions.cpp

@@ -55,11 +55,9 @@ void compute_address_taken_functions(
   std::unordered_set<irep_idt> &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

@@ -62,11 +62,9 @@ void slice_global_inits(goto_modelt &goto_model)
       continue;
 
     for(const auto &i : it->second.body.instructions)
-    {
       i.apply([&symbols](const exprt &expr) {
         find_symbols(expr, symbols, true, false);
       });
-    }
   }
 
   // now remove unnecessary initializations