Merge pull request diffblue#98 from diffblue/mariusmc92/cleanup/replace-plain-string-dynamic-object

Replaced plain string dynamic-object prefix

Author: NathanJPhillips

cbmc

@@ -12,6 +12,8 @@ Author: Chris Smowton, [email protected]
 #include <util/infix.h>
 #include <util/suffix.h>
 
+#include <pointer-analysis/dynamic_object_name.h>
+
 void local_value_sett::make_union_adjusting_evs_types(
   object_mapt &dest,
   const object_mapt &src,
@@ -333,7 +335,7 @@ void local_value_sett::assign_rec(
       to_dynamic_object_expr(lhs);
 
     const std::string name=
-      "value_set::dynamic_object"+
+      prefix_dynamic_object+
       std::to_string(dynamic_object.get_instance());
 
     typet declared_on_type;

src/pointer-analysis/local_value_set.cpp

@@ -17,6 +17,8 @@ Author: Chris Smowton, [email protected]
 
 #include <algorithm>
 
+#include <pointer-analysis/dynamic_object_name.h>
+
 static void gather_external_symbols(
   const exprt &e, const namespacet &ns, std::vector<symbol_exprt>& result)
 {
@@ -264,7 +266,7 @@ void local_value_set_analysist::transform_function_stub_single_external_set(
       for(auto lhs_entry : lhs_entries)
         valuesets.make_union(lhs_entry->object_map, rhs_values);
     }
-    else if(has_prefix(assignment.first.base_name, "value_set::dynamic_object"))
+    else if(has_prefix(assignment.first.base_name, prefix_dynamic_object))
     {
       std::string objkey=assignment.first.base_name+assignment.first.field_name;
       local_value_sett::entryt dynobj_entry_name(
@@ -345,7 +347,7 @@ static void escape_analysis(
 {
   std::vector<unsigned long> roots;
   std::map<unsigned long, std::vector<unsigned long> > edges;
-  const std::string dynobj_prefix="value_set::dynamic_object";
+  const std::string dynobj_prefix=prefix_dynamic_object;
   const auto prefixlen=dynobj_prefix.size();
 
   // Build a pointer graph of dynamic objects, considering anything reachable
@@ -407,7 +409,7 @@ void lvsaa_single_external_set_summaryt::from_final_state(
     if(has_prefix(entryname, prefix))
       export_this_entry=true;
     if((!export_this_entry) &&
-       has_prefix(entryname, "value_set::dynamic_object"))
+       has_prefix(entryname, prefix_dynamic_object))
     {
       export_this_entry=true;
     }