Use common implementation of instruction/goto program equality

Author: tautschnig

jbmc/src/jdiff/java_syntactic_diff.cpp

@@ -70,9 +70,7 @@ bool java_syntactic_difft::operator()()
       continue;
     }
 
-    if(
-      it->second.body.instructions.size() !=
-      f_it->second.body.instructions.size())
+    if(!it->second.body.equals(f_it->second.body))
     {
       modified_functions.insert(it->first);
       continue;
@@ -86,22 +84,7 @@ bool java_syntactic_difft::operator()()
         i_it2 != f_it->second.body.instructions.end();
         ++i_it1, ++i_it2)
     {
-      long jump_difference1 = 0;
-      if(!i_it1->targets.empty())
-      {
-        jump_difference1 =
-          i_it1->get_target()->location_number - i_it1->location_number;
-      }
-      long jump_difference2 = 0;
-      if(!i_it2->targets.empty())
-      {
-        jump_difference2 =
-          i_it2->get_target()->location_number - i_it2->location_number;
-      }
-      if(
-        i_it1->code != i_it2->code || i_it1->function != i_it2->function ||
-        i_it1->type != i_it2->type || i_it1->guard != i_it2->guard ||
-        jump_difference1 != jump_difference2)
+      if(i_it1->function != i_it2->function)
       {
         modified_functions.insert(it->first);
         break;

src/goto-diff/syntactic_diff.cpp

@@ -69,8 +69,7 @@ bool syntactic_difft::operator()()
       continue;
     }
 
-    if(it->second.body.instructions.size() !=
-       f_it->second.body.instructions.size())
+    if(!it->second.body.equals(f_it->second.body))
     {
       modified_functions.insert(it->first);
       continue;
@@ -84,22 +83,7 @@ bool syntactic_difft::operator()()
         i_it2!=f_it->second.body.instructions.end();
         ++i_it1, ++i_it2)
     {
-      long jump_difference1 = 0;
-      if(!i_it1->targets.empty())
-      {
-        jump_difference1 =
-          i_it1->get_target()->location_number - i_it1->location_number;
-      }
-      long jump_difference2 = 0;
-      if(!i_it2->targets.empty())
-      {
-        jump_difference2 =
-          i_it2->get_target()->location_number - i_it2->location_number;
-      }
-      if(
-        i_it1->code != i_it2->code || i_it1->function != i_it2->function ||
-        i_it1->type != i_it2->type || i_it1->guard != i_it2->guard ||
-        jump_difference1 != jump_difference2)
+      if(i_it1->function != i_it2->function)
       {
         modified_functions.insert(it->first);
         break;

src/goto-diff/unified_diff.cpp

@@ -392,9 +392,7 @@ bool unified_difft::instructions_equal(
   const goto_programt::instructiont &ins1,
   const goto_programt::instructiont &ins2)
 {
-  return ins1.code == ins2.code && ins1.function == ins2.function &&
-         ins1.type == ins2.type && ins1.guard == ins2.guard &&
-         ins1.targets.size() == ins2.targets.size() &&
+  return ins1.equals(ins2) && ins1.function == ins2.function &&
          (ins1.targets.empty() ||
           instructions_equal(*ins1.get_target(), *ins2.get_target()));
 }