Removal of make_shallow_copy and faster equality checks.

Author: marek-trtik

src/taint-slicer/irept_instrument.cpp

@@ -13,13 +13,9 @@ Date: May 2017
 
 #include <taint-slicer/irept_instrument.h>
 
-irept make_shallow_copy(const irept irep)
+static bool are_equal(const irept l, const irept r)
 {
-  irept result(irep.id());
-  result.get_sub()=irep.get_sub();
-  result.get_named_sub()=irep.get_named_sub();
-  result.get_comments()=irep.get_comments();
-  return result;
+  return &l.read()==&r.read();
 }
 
 irept instrument(const irept irep, const instrumenter_fnt &instrumenter)
@@ -30,7 +26,7 @@ irept instrument(const irept irep, const instrumenter_fnt &instrumenter)
   for(const irept sub : irep.get_sub())
   {
     new_sub.push_back(instrument(sub, instrumenter));
-    if(new_sub.back()!=sub)
+    if(!are_equal(new_sub.back(), sub))
       modified=true;
   }
 
@@ -44,7 +40,7 @@ irept instrument(const irept irep, const instrumenter_fnt &instrumenter)
           instrument(name_sub.second, instrumenter)
         });
     assert(it_bool.second);
-    if(it_bool.first->second!=name_sub.second)
+    if(!are_equal(it_bool.first->second, name_sub.second))
       modified=true;
   }
 
@@ -58,7 +54,7 @@ irept instrument(const irept irep, const instrumenter_fnt &instrumenter)
           instrument(name_sub.second, instrumenter)
         });
     assert(it_bool.second);
-    if(it_bool.first->second!=name_sub.second)
+    if(!are_equal(it_bool.first->second, name_sub.second))
       modified=true;
   }
 
@@ -85,7 +81,7 @@ irept instrument_using_pivot(
       pit!=pivot.get_sub().cend() && iit!=irep.get_sub().cend(); ++pit, ++iit)
   {
     new_sub.push_back(instrument_using_pivot(*pit, *iit, instrumenter));
-    if(new_sub.back()!=*iit)
+    if(!are_equal(new_sub.back(), *iit))
       modified=true;
   }
 
@@ -103,7 +99,7 @@ irept instrument_using_pivot(
           instrument_using_pivot(pit->second, iit->second, instrumenter)
         });
     assert(it_bool.second);
-    if(it_bool.first->second!=iit->second)
+    if(!are_equal(it_bool.first->second, iit->second))
       modified=true;
   }
 
@@ -121,7 +117,7 @@ irept instrument_using_pivot(
           instrument_using_pivot(pit->second, iit->second, instrumenter)
         });
     assert(it_bool.second);
-    if(it_bool.first->second!=iit->second)
+    if(!are_equal(it_bool.first->second, iit->second))
       modified=true;
   }
 

src/taint-slicer/irept_instrument.h

@@ -24,19 +24,6 @@ typedef std::function<irept(irept, irept)> pivot_instrumenter_fnt;
 
 /*******************************************************************\
 
-Function:
-
-  Inputs:
-
- Outputs:
-
- Purpose:
-
-\*******************************************************************/
-irept make_shallow_copy(const irept irep);
-
-/*******************************************************************\
-
 Function:
 
   Inputs: