Replace use of ns.follow by type_eq

Using ns.follow on both sides of an operator== is better encapsulated in
type_eq.

Author: tautschnig

src/util/allocate_objects.cpp

@@ -13,6 +13,7 @@ Author: Daniel Kroening, [email protected]
 #include "fresh_symbol.h"
 #include "pointer_offset_size.h"
 #include "string_constant.h"
+#include "type_eq.h"
 
 /// Allocates a new object, either by creating a local variable with automatic
 /// lifetime, a global variable with static lifetime, or by dynamically
@@ -183,7 +184,7 @@ exprt allocate_objectst::allocate_dynamic_object(
   output_code.add(assign);
 
   exprt malloc_symbol_expr =
-    ns.follow(malloc_sym.symbol_expr().type()) != ns.follow(target_expr.type())
+    !type_eq(malloc_sym.symbol_expr().type(), target_expr.type(), ns)
       ? (exprt)typecast_exprt(malloc_sym.symbol_expr(), target_expr.type())
       : malloc_sym.symbol_expr();
 
@@ -213,8 +214,7 @@ exprt allocate_objectst::allocate_non_dynamic_object(
   symbols_created.push_back(&aux_symbol);
 
   exprt aoe =
-    ns.follow(aux_symbol.symbol_expr().type()) !=
-        ns.follow(target_expr.type().subtype())
+    !type_eq(aux_symbol.symbol_expr().type(), target_expr.type().subtype(), ns)
       ? (exprt)typecast_exprt(
           address_of_exprt(aux_symbol.symbol_expr()), target_expr.type())
       : address_of_exprt(aux_symbol.symbol_expr());

src/util/simplify_expr_struct.cpp

@@ -200,7 +200,7 @@ bool simplify_exprt::simplify_member(exprt &expr)
   else if(op.id()==ID_union && op_type.id()==ID_union)
   {
     // trivial?
-    if(ns.follow(to_union_expr(op).op().type())==ns.follow(expr.type()))
+    if(type_eq(to_union_expr(op).op().type(), expr.type(), ns))
     {
       exprt tmp=to_union_expr(op).op();
       expr.swap(tmp);