attempt to remove base_type_eq in linker

Author: kroening

src/linking/linking.cpp

@@ -27,6 +27,22 @@ Author: Daniel Kroening, [email protected]
 
 #include "linking_class.h"
 
+bool my_base_type_eq(
+  const typet &type1,
+  const typet &type2,
+  const namespacet &)
+{
+  return type1 == type2;
+}
+
+bool my_base_type_eq(
+  const exprt &expr1,
+  const exprt &expr2,
+  const namespacet &ns)
+{
+  return my_base_type_eq(expr1.type(), expr2.type(), ns);
+}
+
 bool casting_replace_symbolt::replace_symbol_expr(symbol_exprt &s) const
 {
   expr_mapt::const_iterator it = expr_map.find(s.get_identifier());
@@ -150,7 +166,7 @@ void linkingt::detailed_conflict_report_rec(
           t1.id()==ID_array)
   {
     if(
-      depth > 0 && !base_type_eq(
+      depth > 0 && !my_base_type_eq(
                      to_type_with_subtype(t1).subtype(),
                      to_type_with_subtype(t2).subtype(),
                      ns))
@@ -202,7 +218,7 @@ void linkingt::detailed_conflict_report_rec(
           msg+=id2string(components2[i].get_name())+')';
           break;
         }
-        else if(!base_type_eq(subtype1, subtype2, ns))
+        else if(!my_base_type_eq(subtype1, subtype2, ns))
         {
           typedef std::unordered_set<typet, irep_hash> type_sett;
           type_sett parent_types;
@@ -332,7 +348,7 @@ void linkingt::detailed_conflict_report_rec(
       msg+=std::to_string(parameters1.size())+'/';
       msg+=std::to_string(parameters2.size())+')';
     }
-    else if(!base_type_eq(return_type1, return_type2, ns))
+    else if(!my_base_type_eq(return_type1, return_type2, ns))
     {
       conflict_path=
         index_exprt(conflict_path,
@@ -356,7 +372,7 @@ void linkingt::detailed_conflict_report_rec(
         const typet &subtype1=parameters1[i].type();
         const typet &subtype2=parameters2[i].type();
 
-        if(!base_type_eq(subtype1, subtype2, ns))
+        if(!my_base_type_eq(subtype1, subtype2, ns))
         {
           conflict_path=
             index_exprt(conflict_path,
@@ -475,7 +491,7 @@ void linkingt::duplicate_code_symbol(
   symbolt &new_symbol)
 {
   // Both are functions.
-  if(!base_type_eq(old_symbol.type, new_symbol.type, ns))
+  if(!my_base_type_eq(old_symbol.type, new_symbol.type, ns))
   {
     const code_typet &old_t=to_code_type(old_symbol.type);
     const code_typet &new_t=to_code_type(new_symbol.type);
@@ -486,7 +502,7 @@ void linkingt::duplicate_code_symbol(
     // casts we need to fail hard
     if(old_symbol.type.get_bool(ID_C_incomplete) && old_symbol.value.is_nil())
     {
-      if(base_type_eq(old_t.return_type(), new_t.return_type(), ns))
+      if(my_base_type_eq(old_t.return_type(), new_t.return_type(), ns))
          link_warning(
            old_symbol,
            new_symbol,
@@ -504,7 +520,7 @@ void linkingt::duplicate_code_symbol(
     else if(
       new_symbol.type.get_bool(ID_C_incomplete) && new_symbol.value.is_nil())
     {
-      if(base_type_eq(old_t.return_type(), new_t.return_type(), ns))
+      if(my_base_type_eq(old_t.return_type(), new_t.return_type(), ns))
         link_warning(
           old_symbol,
           new_symbol,
@@ -516,7 +532,7 @@ void linkingt::duplicate_code_symbol(
           "implicit function declaration");
     }
     // handle (incomplete) function prototypes
-    else if(base_type_eq(old_t.return_type(), new_t.return_type(), ns) &&
+    else if(my_base_type_eq(old_t.return_type(), new_t.return_type(), ns) &&
             ((old_t.parameters().empty() &&
               old_t.has_ellipsis() &&
               old_symbol.value.is_nil()) ||
@@ -572,7 +588,7 @@ void linkingt::duplicate_code_symbol(
     }
     // conflicting declarations without a definition, matching return
     // types
-    else if(base_type_eq(old_t.return_type(), new_t.return_type(), ns) &&
+    else if(my_base_type_eq(old_t.return_type(), new_t.return_type(), ns) &&
             old_symbol.value.is_nil() &&
             new_symbol.value.is_nil())
     {
@@ -613,7 +629,7 @@ void linkingt::duplicate_code_symbol(
       typedef std::deque<std::pair<typet, typet> > conflictst;
       conflictst conflicts;
 
-      if(!base_type_eq(old_t.return_type(), new_t.return_type(), ns))
+      if(!my_base_type_eq(old_t.return_type(), new_t.return_type(), ns))
         conflicts.push_back(
           std::make_pair(old_t.return_type(), new_t.return_type()));
 
@@ -625,7 +641,7 @@ void linkingt::duplicate_code_symbol(
           n_it!=new_t.parameters().end();
           ++o_it, ++n_it)
       {
-        if(!base_type_eq(o_it->type(), n_it->type(), ns))
+        if(!my_base_type_eq(o_it->type(), n_it->type(), ns))
           conflicts.push_back(
             std::make_pair(o_it->type(), n_it->type()));
       }
@@ -718,7 +734,7 @@ void linkingt::duplicate_code_symbol(
 
           bool found=false;
           for(const auto &c : union_type.components())
-            if(base_type_eq(c.type(), src_type, ns))
+            if(my_base_type_eq(c.type(), src_type, ns))
             {
               found=true;
               if(warn_msg.empty())
@@ -793,7 +809,7 @@ void linkingt::duplicate_code_symbol(
     {
       // ok, silently ignore
     }
-    else if(base_type_eq(old_symbol.type, new_symbol.type, ns))
+    else if(my_base_type_eq(old_symbol.type, new_symbol.type, ns))
     {
       // keep the one in old_symbol -- libraries come last!
       debug().source_location = new_symbol.location;
@@ -816,7 +832,7 @@ bool linkingt::adjust_object_type_rec(
   const typet &t2,
   adjust_type_infot &info)
 {
-  if(base_type_eq(t1, t2, ns))
+  if(my_base_type_eq(t1, t2, ns))
     return false;
 
   if(
@@ -1025,7 +1041,7 @@ void linkingt::duplicate_object_symbol(
   // both are variables
   bool set_to_new = false;
 
-  if(!base_type_eq(old_symbol.type, new_symbol.type, ns))
+  if(!my_base_type_eq(old_symbol.type, new_symbol.type, ns))
   {
     bool failed=
       adjust_object_type(old_symbol, new_symbol, set_to_new);
@@ -1081,7 +1097,7 @@ void linkingt::duplicate_object_symbol(
       simplify(tmp_old, ns);
       simplify(tmp_new, ns);
 
-      if(base_type_eq(tmp_old, tmp_new, ns))
+      if(my_base_type_eq(tmp_old, tmp_new, ns))
       {
         // ok, the same
       }
@@ -1211,7 +1227,7 @@ void linkingt::duplicate_type_symbol(
 
   if(
     old_symbol.type.id() == ID_array && new_symbol.type.id() == ID_array &&
-    base_type_eq(
+    my_base_type_eq(
       to_array_type(old_symbol.type).element_type(),
       to_array_type(new_symbol.type).element_type(),
       ns))
@@ -1286,7 +1302,7 @@ bool linkingt::needs_renaming_type(
 
   if(
     old_symbol.type.id() == ID_array && new_symbol.type.id() == ID_array &&
-    base_type_eq(
+    my_base_type_eq(
       to_array_type(old_symbol.type).element_type(),
       to_array_type(new_symbol.type).element_type(),
       ns))