Merge pull request #6801 from diffblue/pointer_expr

Two pointer expression classes

Author: NlightNFotis

src/goto-instrument/accelerate/acceleration_utils.cpp

@@ -1057,7 +1057,7 @@ bool acceleration_utilst::assign_array(
   {
     if(idx.id()==ID_pointer_offset)
     {
-      poly.from_expr(to_unary_expr(idx).op());
+      poly.from_expr(to_pointer_offset_expr(idx).pointer());
     }
     else
     {

src/goto-instrument/contracts/instrument_spec_assigns.cpp

@@ -468,7 +468,7 @@ car_exprt instrument_spec_assignst::create_car_expr(
 
   if(target.id() == ID_pointer_object)
   {
-    const auto &arg = to_unary_expr(target).op();
+    const auto &arg = to_pointer_object_expr(target).pointer();
     return {
       condition,
       target,

src/goto-instrument/contracts/utils.cpp

@@ -69,7 +69,8 @@ void havoc_assigns_targetst::append_havoc_code_for_expr(
 {
   if(expr.id() == ID_pointer_object)
   {
-    append_object_havoc_code_for_expr(location, expr.operands().front(), dest);
+    append_object_havoc_code_for_expr(
+      location, to_pointer_object_expr(expr).pointer(), dest);
     return;
   }
 

src/goto-programs/interpreter_evaluate.cpp

@@ -779,13 +779,10 @@ interpretert::mp_vectort interpretert::evaluate(const exprt &expr)
   }
   else if(expr.id()==ID_pointer_offset)
   {
-    if(expr.operands().size()!=1)
-      throw "pointer_offset expects one operand";
-
-    if(to_unary_expr(expr).op().type().id() != ID_pointer)
+    if(to_pointer_offset_expr(expr).op().type().id() != ID_pointer)
       throw "pointer_offset expects a pointer operand";
 
-    mp_vectort result = evaluate(to_unary_expr(expr).op());
+    mp_vectort result = evaluate(to_pointer_offset_expr(expr).op());
 
     if(result.size()==1)
     {

src/pointer-analysis/value_set.cpp

@@ -309,7 +309,7 @@ bool value_sett::eval_pointer_offset(
   if(expr.id()==ID_pointer_offset)
   {
     const object_mapt reference_set =
-      get_value_set(to_unary_expr(expr).op(), ns, true);
+      get_value_set(to_pointer_offset_expr(expr).pointer(), ns, true);
 
     exprt new_expr;
     mp_integer previous_offset=0;

src/solvers/flattening/bv_pointers.cpp

@@ -683,17 +683,18 @@ bvt bv_pointerst::convert_bitvector(const exprt &expr)
   }
   else if(
     expr.id() == ID_pointer_offset &&
-    to_unary_expr(expr).op().type().id() == ID_pointer)
+    to_pointer_offset_expr(expr).pointer().type().id() == ID_pointer)
   {
     std::size_t width=boolbv_width(expr.type());
 
     if(width==0)
       return conversion_failed(expr);
 
-    const exprt &op0 = to_unary_expr(expr).op();
-    const bvt &op0_bv = convert_bv(op0);
+    const exprt &pointer = to_pointer_offset_expr(expr).pointer();
+    const bvt &pointer_bv = convert_bv(pointer);
 
-    bvt offset_bv = offset_literals(op0_bv, to_pointer_type(op0.type()));
+    bvt offset_bv =
+      offset_literals(pointer_bv, to_pointer_type(pointer.type()));
 
     // we do a sign extension to permit negative offsets
     return bv_utils.sign_extension(offset_bv, width);
@@ -712,17 +713,18 @@ bvt bv_pointerst::convert_bitvector(const exprt &expr)
   }
   else if(
     expr.id() == ID_pointer_object &&
-    to_unary_expr(expr).op().type().id() == ID_pointer)
+    to_pointer_object_expr(expr).pointer().type().id() == ID_pointer)
   {
     std::size_t width=boolbv_width(expr.type());
 
     if(width==0)
       return conversion_failed(expr);
 
-    const exprt &op0 = to_unary_expr(expr).op();
-    const bvt &op0_bv = convert_bv(op0);
+    const exprt &pointer = to_pointer_object_expr(expr).pointer();
+    const bvt &pointer_bv = convert_bv(pointer);
 
-    bvt object_bv = object_literals(op0_bv, to_pointer_type(op0.type()));
+    bvt object_bv =
+      object_literals(pointer_bv, to_pointer_type(pointer.type()));
 
     return bv_utils.zero_extension(object_bv, width);
   }

src/solvers/smt2/smt2_conv.cpp

@@ -1562,7 +1562,7 @@ void smt2_convt::convert_expr(const exprt &expr)
   }
   else if(expr.id()==ID_pointer_offset)
   {
-    const auto &op = to_unary_expr(expr).op();
+    const auto &op = to_pointer_offset_expr(expr).pointer();
 
     DATA_INVARIANT(
       op.type().id() == ID_pointer,
@@ -1589,7 +1589,7 @@ void smt2_convt::convert_expr(const exprt &expr)
   }
   else if(expr.id()==ID_pointer_object)
   {
-    const auto &op = to_unary_expr(expr).op();
+    const auto &op = to_pointer_object_expr(expr).pointer();
 
     DATA_INVARIANT(
       op.type().id() == ID_pointer,

src/util/pointer_expr.h

@@ -873,4 +873,120 @@ to_annotated_pointer_constant_expr(exprt &expr)
   return ret;
 }
 
+/// The offset (in bytes) of a pointer relative to the object
+class pointer_offset_exprt : public unary_exprt
+{
+public:
+  explicit pointer_offset_exprt(exprt pointer, typet type)
+    : unary_exprt(ID_pointer_offset, std::move(pointer), std::move(type))
+  {
+  }
+
+  exprt &pointer()
+  {
+    return op0();
+  }
+
+  const exprt &pointer() const
+  {
+    return op0();
+  }
+};
+
+template <>
+inline bool can_cast_expr<pointer_offset_exprt>(const exprt &base)
+{
+  return base.id() == ID_pointer_offset;
+}
+
+inline void validate_expr(const pointer_offset_exprt &value)
+{
+  validate_operands(value, 1, "pointer_offset must have one operand");
+  DATA_INVARIANT(
+    value.pointer().type().id() == ID_pointer,
+    "pointer_offset must have pointer-typed operand");
+}
+
+/// \brief Cast an exprt to a \ref pointer_offset_exprt
+///
+/// \a expr must be known to be \ref pointer_offset_exprt.
+///
+/// \param expr: Source expression
+/// \return Object of type \ref pointer_offset_exprt
+inline const pointer_offset_exprt &to_pointer_offset_expr(const exprt &expr)
+{
+  PRECONDITION(expr.id() == ID_pointer_offset);
+  const pointer_offset_exprt &ret =
+    static_cast<const pointer_offset_exprt &>(expr);
+  validate_expr(ret);
+  return ret;
+}
+
+/// \copydoc to_pointer_offset_expr(const exprt &)
+inline pointer_offset_exprt &to_pointer_offset_expr(exprt &expr)
+{
+  PRECONDITION(expr.id() == ID_pointer_offset);
+  pointer_offset_exprt &ret = static_cast<pointer_offset_exprt &>(expr);
+  validate_expr(ret);
+  return ret;
+}
+
+/// A numerical identifier for the object a pointer points to
+class pointer_object_exprt : public unary_exprt
+{
+public:
+  explicit pointer_object_exprt(exprt pointer, typet type)
+    : unary_exprt(ID_pointer_object, std::move(pointer), std::move(type))
+  {
+  }
+
+  exprt &pointer()
+  {
+    return op0();
+  }
+
+  const exprt &pointer() const
+  {
+    return op0();
+  }
+};
+
+template <>
+inline bool can_cast_expr<pointer_object_exprt>(const exprt &base)
+{
+  return base.id() == ID_pointer_object;
+}
+
+inline void validate_expr(const pointer_object_exprt &value)
+{
+  validate_operands(value, 1, "pointer_object must have one operand");
+  DATA_INVARIANT(
+    value.pointer().type().id() == ID_pointer,
+    "pointer_object must have pointer-typed operand");
+}
+
+/// \brief Cast an exprt to a \ref pointer_object_exprt
+///
+/// \a expr must be known to be \ref pointer_object_exprt.
+///
+/// \param expr: Source expression
+/// \return Object of type \ref pointer_object_exprt
+inline const pointer_object_exprt &to_pointer_object_expr(const exprt &expr)
+{
+  PRECONDITION(expr.id() == ID_pointer_object);
+  const pointer_object_exprt &ret =
+    static_cast<const pointer_object_exprt &>(expr);
+  validate_expr(ret);
+  return ret;
+}
+
+/// \copydoc to_pointer_object_expr(const exprt &)
+inline pointer_object_exprt &to_pointer_object_expr(exprt &expr)
+{
+  PRECONDITION(expr.id() == ID_pointer_object);
+  pointer_object_exprt &ret = static_cast<pointer_object_exprt &>(expr);
+  validate_expr(ret);
+  return ret;
+}
+
 #endif // CPROVER_UTIL_POINTER_EXPR_H

src/util/pointer_predicates.cpp

@@ -22,7 +22,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 exprt pointer_object(const exprt &p)
 {
-  return unary_exprt(ID_pointer_object, p, size_type());
+  return pointer_object_exprt(p, size_type());
 }
 
 exprt same_object(const exprt &p1, const exprt &p2)
@@ -37,7 +37,7 @@ exprt object_size(const exprt &pointer)
 
 exprt pointer_offset(const exprt &pointer)
 {
-  return unary_exprt(ID_pointer_offset, pointer, signed_size_type());
+  return pointer_offset_exprt(pointer, signed_size_type());
 }
 
 exprt deallocated(const exprt &pointer, const namespacet &ns)

src/util/simplify_expr.cpp

@@ -2388,7 +2388,7 @@ simplify_exprt::resultt<> simplify_exprt::simplify_node(exprt node)
   }
   else if(expr.id()==ID_pointer_object)
   {
-    r = simplify_pointer_object(to_unary_expr(expr));
+    r = simplify_pointer_object(to_pointer_object_expr(expr));
   }
   else if(expr.id() == ID_is_dynamic_object)
   {
@@ -2483,7 +2483,7 @@ simplify_exprt::resultt<> simplify_exprt::simplify_node(exprt node)
   }
   else if(expr.id()==ID_pointer_offset)
   {
-    r = simplify_pointer_offset(to_unary_expr(expr));
+    r = simplify_pointer_offset(to_pointer_offset_expr(expr));
   }
   else if(expr.id()==ID_extractbit)
   {