correctly convert object_address

Author: kroening

src/solvers/flattening/bv_pointers.cpp

@@ -419,6 +419,11 @@ bvt bv_pointerst::convert_pointer_type(const exprt &expr)
     CHECK_RETURN(bv_opt->size() == bits);
     return *bv_opt;
   }
+  else if(expr.id() == ID_object_address)
+  {
+    const auto &object_address_expr = to_object_address_expr(expr);
+    return add_addr(object_address_expr.object_expr());
+  }
   else if(expr.id()==ID_constant)
   {
     const constant_exprt &c = to_constant_expr(expr);
@@ -756,11 +761,6 @@ bvt bv_pointerst::convert_bitvector(const exprt &expr)
 
     return bv_utils.zero_extension(op0, width);
   }
-  else if(expr.id() == ID_object_address)
-  {
-    const auto &object_address_expr = to_object_address_expr(expr);
-    return add_addr(object_address_expr.object_expr());
-  }
 
   return SUB::convert_bitvector(expr);
 }