Use is_invalid_pointer_exprt directly

Author: Owen

src/analyses/goto_check.cpp

@@ -1129,18 +1129,16 @@ goto_checkt::address_check(const exprt &address, const exprt &size)
 
     if(flags.is_unknown())
     {
-      conditions.push_back(
-        conditiont(not_exprt(is_invalid_pointer(address)), "pointer invalid"));
+      conditions.push_back(conditiont{
+        not_exprt{is_invalid_pointer_exprt{address}}, "pointer invalid"});
     }
 
     if(flags.is_uninitialized())
     {
       conditions.push_back(
-        conditiont(
-          or_exprt(
-            in_bounds_of_some_explicit_allocation,
-            not_exprt(is_invalid_pointer(address))),
-          "pointer uninitialized"));
+        conditiont{or_exprt{in_bounds_of_some_explicit_allocation,
+                            not_exprt{is_invalid_pointer_exprt{address}}},
+                   "pointer uninitialized"});
     }
 
     if(flags.is_unknown() || flags.is_dynamic_heap())

src/ansi-c/c_typecheck_expr.cpp

@@ -2104,7 +2104,7 @@ exprt c_typecheck_baset::do_special_functions(
       throw 0;
     }
 
-    exprt same_object_expr = is_invalid_pointer(expr.arguments().front());
+    exprt same_object_expr = is_invalid_pointer_exprt{expr.arguments().front()};
     same_object_expr.add_source_location()=source_location;
 
     return same_object_expr;

src/util/pointer_predicates.cpp

@@ -105,7 +105,7 @@ exprt good_pointer_def(
 
   const not_exprt not_null(null_pointer(pointer));
 
-  const not_exprt not_invalid(is_invalid_pointer(pointer));
+  const not_exprt not_invalid{is_invalid_pointer_exprt{pointer}};
 
   const or_exprt bad_other(
     object_lower_bound(pointer, nil_exprt()),
@@ -139,11 +139,6 @@ exprt null_pointer(const exprt &pointer)
   return same_object(pointer, null_pointer);
 }
 
-exprt is_invalid_pointer(const exprt &pointer)
-{
-  return is_invalid_pointer_exprt{pointer};
-}
-
 exprt dynamic_object_lower_bound(
   const exprt &pointer,
   const exprt &offset)

src/util/pointer_predicates.h

@@ -33,7 +33,6 @@ exprt good_pointer_def(const exprt &pointer, const namespacet &);
 exprt null_object(const exprt &pointer);
 exprt null_pointer(const exprt &pointer);
 exprt integer_address(const exprt &pointer);
-exprt is_invalid_pointer(const exprt &pointer);
 exprt dynamic_object_lower_bound(
   const exprt &pointer,
   const exprt &offset);