Updates requested in the peer review.

Author: marek-trtik

src/analyses/goto_check.cpp

@@ -1667,11 +1667,11 @@ void goto_checkt::goto_check(
         {
           // need to mark the dead variable as dead
           goto_programt::targett t=new_code.add_instruction(ASSIGN);
-          exprt address_of_expr = address_of_exprt(variable);
+          address_of_exprt address_of_expr = address_of_exprt(variable);
           exprt lhs=ns.lookup(CPROVER_PREFIX "dead_object").symbol_expr();
           if(!base_type_eq(lhs.type(), address_of_expr.type(), ns))
             address_of_expr.make_typecast(lhs.type());
-          exprt rhs = if_exprt(
+          if_exprt rhs = if_exprt(
             side_effect_expr_nondett(bool_typet()),
             address_of_expr,
             lhs,

src/ansi-c/expr2c.cpp

@@ -1124,7 +1124,7 @@ std::string expr2ct::convert_allocate(const exprt &src, unsigned &precedence)
   std::string op0 = convert_with_precedence(src.op0(), p0);
 
   unsigned p1;
-  std::string op1 = convert_with_precedence(src.op1(), p1);
+  const std::string op1 = convert_with_precedence(src.op1(), p1);
 
   std::string dest = "ALLOCATE";
   dest += '(';

src/util/simplify_expr_boolean.cpp

@@ -84,17 +84,10 @@ bool simplify_exprt::simplify_boolean(exprt &expr)
       if(it->type().id() != ID_bool)
         return true;
 
-      bool erase;
-
       if(it->is_true())
-      {
-        erase = true;
         negate = !negate;
-      }
-      else
-        erase = it->is_false();
 
-      if(erase)
+      if(it->is_constant())
       {
         it = operands.erase(it);
         result = false;