Merge pull request diffblue#313 from diffblue/owen-jones-diffblue/add-structured-lhs-to-value-set

SEC-175: Add `structured_lhs` field to entryt

Author: owen-jones-diffblue

src/pointer-analysis/value_set.cpp

@@ -1406,7 +1406,7 @@ void value_sett::assign_rec(
   if(lhs.id()==ID_symbol)
   {
     const irep_idt &identifier=to_symbol_expr(lhs).get_identifier();
-    entryt &e=get_entry(entryt(identifier, suffix), lhs.type(), ns);
+    entryt &e = get_entry(entryt(identifier, suffix, lhs), lhs.type(), ns);
 
     if(add_to_sets)
       make_union(e.object_map, values_rhs);
@@ -1419,7 +1419,7 @@ void value_sett::assign_rec(
       to_dynamic_object_expr(lhs);
     std::string name=get_dynamic_object_name(dynamic_object);
 
-    entryt &e=get_entry(entryt(name, suffix), lhs.type(), ns);
+    entryt &e = get_entry(entryt(name, suffix, lhs), lhs.type(), ns);
 
     make_union(e.object_map, values_rhs);
   }

src/pointer-analysis/value_set.h

@@ -247,34 +247,38 @@ class value_sett
     idt identifier;
     std::string suffix;
     typet declared_on_type;
+    exprt structured_lhs;
 
     entryt()
     {
     }
 
-    entryt(const idt &_identifier, const std::string &_suffix):
-      identifier(_identifier),
-      suffix(_suffix)
+    entryt(
+      const idt &_identifier,
+      const std::string &_suffix,
+      const exprt &structured_lhs)
+      : identifier(_identifier), suffix(_suffix), structured_lhs(structured_lhs)
     {
     }
 
     entryt(
       const idt &_identifier,
       const std::string &_suffix,
-      const typet &_declared_on_type):
-      identifier(_identifier),
-      suffix(_suffix),
-      declared_on_type(_declared_on_type)
+      const typet &_declared_on_type,
+      const exprt &structured_lhs)
+      : identifier(_identifier),
+        suffix(_suffix),
+        declared_on_type(_declared_on_type),
+        structured_lhs(structured_lhs)
     {
     }
 
     bool operator==(const entryt &other) const
     {
-      return
-        identifier==other.identifier &&
-        suffix==other.suffix &&
-        declared_on_type==other.declared_on_type &&
-        object_map==other.object_map;
+      return identifier == other.identifier && suffix == other.suffix &&
+             declared_on_type == other.declared_on_type &&
+             structured_lhs == other.structured_lhs &&
+             object_map == other.object_map;
     }
     bool operator!=(const entryt &other) const
     {