Merge pull request #6139 from tautschnig/conversion-failed

Remove conversion_failed(exprt, bvt)

Author: martin-cs

src/solvers/flattening/boolbv.h

@@ -124,11 +124,6 @@ class boolbvt:public arrayst
   // NOLINTNEXTLINE(readability/identifiers)
   typedef arrayst SUB;
 
-  void conversion_failed(const exprt &expr, bvt &bv)
-  {
-    bv=conversion_failed(expr);
-  }
-
   bvt conversion_failed(const exprt &expr);
 
   typedef std::unordered_map<const exprt, bvt, irep_hash> bv_cachet;

src/solvers/flattening/bv_pointers.cpp

@@ -379,12 +379,7 @@ bvt bv_pointerst::convert_pointer_type(const exprt &expr)
 
     auto bv_opt = convert_address_of_rec(address_of_expr.op());
     if(!bv_opt.has_value())
-    {
-      bvt bv;
-      bv.resize(bits);
-      conversion_failed(address_of_expr, bv);
-      return bv;
-    }
+      return conversion_failed(address_of_expr);
 
     CHECK_RETURN(bv_opt->size() == bits);
     return *bv_opt;
@@ -452,9 +447,7 @@ bvt bv_pointerst::convert_pointer_type(const exprt &expr)
       if(it->type().id()!=ID_unsignedbv &&
          it->type().id()!=ID_signedbv)
       {
-        bvt failed_bv;
-        conversion_failed(plus_expr, failed_bv);
-        return failed_bv;
+        return conversion_failed(plus_expr);
       }
 
       bv_utilst::representationt rep=
@@ -485,9 +478,7 @@ bvt bv_pointerst::convert_pointer_type(const exprt &expr)
       minus_expr.rhs().type().id() != ID_unsignedbv &&
       minus_expr.rhs().type().id() != ID_signedbv)
     {
-      bvt bv;
-      conversion_failed(minus_expr, bv);
-      return bv;
+      return conversion_failed(minus_expr);
     }
 
     const unary_minus_exprt neg_op1(minus_expr.rhs());