Extend object_descriptor_exprt::build and use it

Move the implementation from the unit test to object_descriptor_exprt to have
all users of object_descriptor_exprt benefit from it.

Author: tautschnig

jbmc/unit/java-testing-utils/require_goto_statements.cpp

@@ -18,39 +18,6 @@ Author: Diffblue Ltd.
 #include <util/expr_util.h>
 #include <util/suffix.h>
 
-/// Given an expression, attempt to find the underlying symbol it represents
-/// by skipping over type casts and removing balanced dereference/address_of
-/// operations
-optionalt<symbol_exprt>
-root_object(const exprt &lhs_expr, const symbol_tablet &symbol_table)
-{
-  auto expr = skip_typecast(lhs_expr);
-  int dereference_balance = 0;
-  while(!can_cast_expr<symbol_exprt>(expr))
-  {
-    if(const auto deref = expr_try_dynamic_cast<dereference_exprt>(expr))
-    {
-      ++dereference_balance;
-      expr = skip_typecast(deref->pointer());
-    }
-    else if(
-      const auto address_of = expr_try_dynamic_cast<address_of_exprt>(expr))
-    {
-      --dereference_balance;
-      expr = skip_typecast(address_of->object());
-    }
-    else
-    {
-      return {};
-    }
-  }
-  if(dereference_balance != 0)
-  {
-    return {};
-  }
-  return to_symbol_expr(expr);
-}
-
 /// Expand value of a function to include all child codets
 /// \param function_value: The value of the function (e.g. got by looking up
 ///  the function in the symbol table and getting the value)
@@ -139,7 +106,7 @@ require_goto_statements::find_struct_component_assignments(
             ode.build(superclass_expr, ns);
             if(
               superclass_expr.get_component_name() == supercomponent_name &&
-              root_object(ode.root_object(), symbol_table)->get_identifier() ==
+              to_symbol_expr(ode.root_object()).get_identifier() ==
                 structure_name)
             {
               if(
@@ -162,10 +129,13 @@ require_goto_statements::find_struct_component_assignments(
           // - component name: \p component_name
           // - operand (component of): symbol for \p structure_name
 
-          const auto &root_object =
-            ::root_object(member_expr.struct_op(), symbol_table);
+          object_descriptor_exprt ode;
+          const namespacet ns(symbol_table);
+          ode.build(member_expr, ns);
           if(
-            root_object && root_object->get_identifier() == structure_name &&
+            ode.root_object().id() == ID_symbol &&
+            to_symbol_expr(ode.root_object()).get_identifier() ==
+              structure_name &&
             member_expr.get_component_name() == component_name)
           {
             if(

src/util/std_expr.cpp

@@ -10,11 +10,10 @@ Author: Daniel Kroening, [email protected]
 
 #include <util/namespace.h>
 
-#include <cassert>
-
 #include "arith_tools.h"
 #include "byte_operators.h"
 #include "c_types.h"
+#include "expr_util.h"
 #include "mathematical_types.h"
 #include "pointer_offset_size.h"
 
@@ -114,6 +113,15 @@ static void build_object_descriptor_rec(
 
     build_object_descriptor_rec(ns, tc.op(), dest);
   }
+  else if(const auto deref = expr_try_dynamic_cast<dereference_exprt>(expr))
+  {
+    const exprt &pointer = skip_typecast(deref->pointer());
+    if(const auto address_of = expr_try_dynamic_cast<address_of_exprt>(pointer))
+    {
+      dest.object() = address_of->object();
+      build_object_descriptor_rec(ns, address_of->object(), dest);
+    }
+  }
 }
 
 /// Build an object_descriptor_exprt from a given expr

src/util/std_expr.h

@@ -2026,6 +2026,10 @@ class object_descriptor_exprt:public binary_exprt
   {
   }
 
+  /// Given an expression \p expr, attempt to find the underlying object it
+  /// represents by skipping over type casts and removing balanced
+  /// dereference/address_of operations; that object will then be available
+  /// as root_object().
   void build(const exprt &expr, const namespacet &ns);
 
   exprt &object()