Merge remote-tracking branch 'smowton-nontg/sss_keep_identical_structs' into sss_temporary_merge

Author: smowton

src/util/simplify_expr.cpp

@@ -261,7 +261,7 @@ bool simplify_exprt::simplify_typecast(exprt &expr)
   }
 
   // eliminate redundant typecasts
-  if(base_type_eq(expr.type(), expr.op0().type(), ns))
+  if((!keep_identical_structs) && base_type_eq(expr.type(), expr.op0().type(), ns))
   {
     exprt tmp;
     tmp.swap(expr.op0());

src/util/simplify_expr_class.h

@@ -38,6 +38,7 @@ class simplify_exprt
 public:
   explicit simplify_exprt(const namespacet &_ns):
     do_simplify_if(true),
+    keep_identical_structs(false),
     ns(_ns)
 #ifdef DEBUG_ON_DEMAND
     , debug_on(false)
@@ -54,6 +55,7 @@ class simplify_exprt
   }
 
   bool do_simplify_if;
+  bool keep_identical_structs;
 
   // These below all return 'true' if the simplification wasn't applicable.
   // If false is returned, the expression has changed.