Added usages of the dynamic-object prefix's string

Used the dynamic-object prefix's global const string instead of the plain string in VSA.
diffblue · Apr 11, 2017 · 42f12f1 · 42f12f1
1 parent 8a7fbb7
commit 42f12f1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/pointer-analysis/dynamic_object_name.h b/src/pointer-analysis/dynamic_object_name.h
@@ -40,7 +40,7 @@ inline std::string get_dynamic_object_name(
   const dynamic_object_exprt &dynamic_object)
 {
   std::string name=
-    "value_set::dynamic_object"+
+    prefix_dynamic_object+
     std::to_string(dynamic_object.get_instance());
 
   if(dynamic_object.get_recency()==

diff --git a/src/pointer-analysis/value_set.cpp b/src/pointer-analysis/value_set.cpp
@@ -51,7 +51,7 @@ bool value_sett::field_sensitive(
   const namespacet &ns)
 {
   // we always track fields on these
-  if(has_prefix(id2string(id), "value_set::dynamic_object") ||
+  if(has_prefix(id2string(id), prefix_dynamic_object) ||
      id=="value_set::return_value" ||
      id=="value_set::memory")
     return true;
@@ -152,7 +152,7 @@ void value_sett::output(
 
     const entryt &e=v_it->second;
 
-    if(has_prefix(id2string(e.identifier), "value_set::dynamic_object"))
+    if(has_prefix(id2string(e.identifier), prefix_dynamic_object))
     {
       display_name=id2string(e.identifier)+e.suffix;
       identifier="";

diff --git a/src/pointer-analysis/value_set_fi.cpp b/src/pointer-analysis/value_set_fi.cpp
@@ -64,7 +64,7 @@ void value_set_fit::output(
 
     const entryt &e=v_it->second;
 
-    if(has_prefix(id2string(e.identifier), "value_set::dynamic_object"))
+    if(has_prefix(id2string(e.identifier), prefix_dynamic_object))
     {
       display_name=id2string(e.identifier)+e.suffix;
       identifier="";
@@ -316,7 +316,7 @@ bool value_set_fit::make_union(const value_set_fit::valuest &new_values)
     {
       // we always track these
       if(has_prefix(id2string(it->second.identifier),
-                    "value_set::dynamic_object") ||
+                    prefix_dynamic_object) ||
          has_prefix(id2string(it->second.identifier),
                     "value_set::return_value"))
       {
@@ -1434,7 +1434,7 @@ void value_set_fit::assign_rec(
     const irep_idt &identifier=lhs.get(ID_identifier);
 
     if(has_prefix(id2string(identifier),
-                  "value_set::dynamic_object") ||
+                  prefix_dynamic_object) ||
        has_prefix(id2string(identifier),
                   "value_set::return_value") ||
        values.find(id2string(identifier)+suffix)!=values.end())

diff --git a/src/pointer-analysis/value_set_fivr.cpp b/src/pointer-analysis/value_set_fivr.cpp
@@ -1562,7 +1562,7 @@ void value_set_fivrt::assign_rec(
     const irep_idt &identifier=lhs.get(ID_identifier);
 
     if(has_prefix(id2string(identifier),
-                  "value_set::dynamic_object") ||
+                  prefix_dynamic_object) ||
        has_prefix(id2string(identifier),
                   "value_set::return_value") ||
        values.find(id2string(identifier)+suffix)!=values.end())

diff --git a/src/pointer-analysis/value_set_fivrns.cpp b/src/pointer-analysis/value_set_fivrns.cpp
@@ -1202,7 +1202,7 @@ void value_set_fivrnst::assign_rec(
     const irep_idt &identifier=lhs.get(ID_identifier);
 
     if(has_prefix(id2string(identifier),
-                  "value_set::dynamic_object") ||
+                  prefix_dynamic_object) ||
        has_prefix(id2string(identifier),
                   "value_set::return_value") ||
        values.find(id2string(identifier)+suffix)!=values.end())