Refactoring: Use type contained in entryt

An entryt contains the entire expr that it represents in the field
`structured_lhs`, so there is no need to pass the type to
entryt::get_key() or value_sett::get_entry()

Author: Owen Jones

cbmc/src/pointer-analysis/value_set.cpp

@@ -53,11 +53,10 @@ bool value_sett::field_sensitive(
 
 value_sett::entryt &value_sett::get_entry(
   const entryt &e,
-  const typet &type,
   const namespacet &ns)
 {
   std::pair<valuest::iterator, bool> r =
-    values.insert(std::pair<idt, entryt>(e.get_key(type, ns), e));
+    values.insert(std::pair<idt, entryt>(e.get_key(ns), e));
 
   return r.first->second;
 }
@@ -1403,7 +1402,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), lhs.type(), ns);
+    entryt &e = get_entry(entryt(identifier, suffix, lhs), ns);
 
     if(add_to_sets)
       make_union(e.object_map, values_rhs);
@@ -1416,7 +1415,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), lhs.type(), ns);
+    entryt &e = get_entry(entryt(name, suffix, lhs), ns);
 
     make_union(e.object_map, values_rhs);
   }

cbmc/src/pointer-analysis/value_set.h

@@ -299,9 +299,9 @@ class value_sett
       return !(*this==other);
     }
 
-    const irep_idt get_key(const typet &type, const namespacet &ns) const
+    const irep_idt get_key(const namespacet &ns) const
     {
-      if(field_sensitive(identifier, type, ns))
+      if(field_sensitive(identifier, structured_lhs.type(), ns))
         return id2string(identifier) + suffix;
 
       return identifier;
@@ -373,13 +373,8 @@ class value_sett
   ///   `object_map` (RHS value set) will be copied; otherwise it will be
   ///   ignored. Therefore it should probably be left blank and any RHS updates
   ///   conducted against the returned reference.
-  /// \param type: type of `e.identifier`, used to determine whether `e`'s
-  ///   suffix should be used to find a field-sensitive value-set or whether
-  ///   a single entry should be shared by all of symbol `e.identifier`.
   /// \param ns: global namespace
-  entryt &get_entry(
-    const entryt &e, const typet &type,
-    const namespacet &ns);
+  entryt &get_entry(const entryt &e, const namespacet &ns);
 
   /// Pretty-print this value-set
   /// \param ns: global namespace

src/pointer-analysis/local_value_set.cpp

@@ -535,13 +535,12 @@ void local_value_sett::demote_most_recent_dynamic_objects(
         to_dynamic_object_expr(entry.structured_lhs);
       expr_any_allocation.set_recency(false);
 
-      // The second and third arguments to get_entry() are only used for
-      // field_sensitive(), and that will always returns true without using
-      // them because name_any_allocation starts with the prefix for a
-      // dynamic object, so we can use an empty type and namespace.
+      // The second argument to get_entry() is only used for field_sensitive(),
+      // and that will always returns true without using it because
+      // name_any_allocation starts with the prefix for a dynamic object, so
+      // we can use an empty namespace.
       entryt &entry_any_allocation = get_entry(
         entryt(name_any_allocation, entry.suffix, expr_any_allocation),
-        nil_typet(),
         namespacet(symbol_tablet()));
 
       // Add into the any-allocation dynamic-object's object_map
@@ -618,8 +617,8 @@ void local_value_sett::assign_rec(
       ns,
       declared_on_type,
       suffix_without_supertypes_ignored);
-    entryt &e = get_entry(
-      entryt(identifier, suffix, declared_on_type, lhs), lhs.type(), ns);
+    entryt &e =
+      get_entry(entryt(identifier, suffix, declared_on_type, lhs), ns);
 
     if(add_to_sets)
       make_union(e.object_map, values_rhs);
@@ -641,8 +640,7 @@ void local_value_sett::assign_rec(
       declared_on_type,
       suffix_without_supertypes_ignored);
 
-    entryt &entry =
-      get_entry(entryt(name, suffix, declared_on_type, lhs), lhs.type(), ns);
+    entryt &entry = get_entry(entryt(name, suffix, declared_on_type, lhs), ns);
 
     if(
       dynamic_object.get_recency() ==

src/pointer-analysis/local_value_set_analysis.cpp

@@ -94,8 +94,7 @@ static void add_default_evses(
         false);
       local_value_sett::entryt extsym_entry_blank(
         id2string(extsym_name), "", typet(), extsym_var);
-      auto &extsym_entry =
-        value_set.get_entry(extsym_entry_blank, extsym.type().subtype(), ns);
+      auto &extsym_entry = value_set.get_entry(extsym_entry_blank, ns);
       value_set.insert(extsym_entry.object_map, extsym_var);
     }
   }
@@ -575,9 +574,7 @@ void local_value_set_analysist::transform_function_stub(
         lhs_fieldname.field_name,
         lhs_fieldname.declared_on_type,
         lhs_fieldname.structured_lhs);
-      const auto &global_sym = ns.lookup(lhs_fieldname.base_name);
-      auto &global_entry =
-        valuesets.get_entry(global_entry_name, global_sym.type, ns);
+      auto &global_entry = valuesets.get_entry(global_entry_name, ns);
       valuesets.make_union(global_entry.object_map, rhs_values);
     }
   }