Merge pull request diffblue#2508 from tautschnig/skip-typecast

Make skip_typecast widely available

Author: Daniel Kroening

src/goto-instrument/goto_program2code.cpp

@@ -13,22 +13,15 @@ Author: Daniel Kroening, [email protected]
 
 #include <sstream>
 
-#include <util/c_types.h>
+#include <util/arith_tools.h>
 #include <util/config.h>
+#include <util/c_types.h>
+#include <util/expr_util.h>
+#include <util/find_symbols.h>
 #include <util/prefix.h>
 #include <util/simplify_expr.h>
-#include <util/find_symbols.h>
-#include <util/arith_tools.h>
 #include <util/type_eq.h>
 
-static const exprt &skip_typecast(const exprt &expr)
-{
-  if(expr.id()!=ID_typecast)
-    return expr;
-
-  return skip_typecast(to_typecast_expr(expr).op());
-}
-
 void goto_program2codet::operator()()
 {
   // labels stored for cleanup

src/util/expr_util.cpp

@@ -201,3 +201,11 @@ if_exprt lift_if(const exprt &src, std::size_t operand_number)
 
   return result;
 }
+
+const exprt &skip_typecast(const exprt &expr)
+{
+  if(expr.id()!=ID_typecast)
+    return expr;
+
+  return skip_typecast(to_typecast_expr(expr).op());
+}

src/util/expr_util.h

@@ -72,4 +72,7 @@ bool has_subtype(const typet &, const irep_idt &id, const namespacet &);
 /// lift up an if_exprt one level
 if_exprt lift_if(const exprt &, std::size_t operand_number);
 
+/// find the expression nested inside typecasts, if any
+const exprt &skip_typecast(const exprt &expr);
+
 #endif // CPROVER_UTIL_EXPR_UTIL_H