Use lift-if more consistently

Author: smowton

src/util/simplify_expr_array.cpp

@@ -9,6 +9,7 @@ Author: Daniel Kroening, [email protected]
 #include "simplify_expr_class.h"
 
 #include "arith_tools.h"
+#include "expr_util.h"
 #include "namespace.h"
 #include "pointer_offset_size.h"
 #include "replace_expr.h"
@@ -213,15 +214,7 @@ bool simplify_exprt::simplify_index(exprt &expr)
   }
   else if(array.id()==ID_if)
   {
-    const if_exprt &if_expr=to_if_expr(array);
-    exprt cond=if_expr.cond();
-
-    index_exprt idx_false=to_index_expr(expr);
-    idx_false.array()=if_expr.false_case();
-
-    to_index_expr(expr).array()=if_expr.true_case();
-
-    expr=if_exprt(cond, expr, idx_false, expr.type());
+    expr = lift_if(expr, 0);
     simplify_rec(expr);
 
     return false;

src/util/simplify_expr_pointer.cpp

@@ -498,16 +498,11 @@ bool simplify_exprt::simplify_pointer_object(exprt &expr)
 
   if(op.id()==ID_if)
   {
-    const if_exprt &if_expr=to_if_expr(op);
-    exprt cond=if_expr.cond();
-
-    exprt p_o_false=expr;
-    p_o_false.op0()=if_expr.false_case();
-
-    expr.op0()=if_expr.true_case();
-
-    expr=if_exprt(cond, expr, p_o_false, expr.type());
-    simplify_rec(expr);
+    if_exprt if_expr = lift_if(expr, 0);
+    simplify_pointer_object(if_expr.true_case());
+    simplify_pointer_object(if_expr.false_case());
+    simplify_if(if_expr);
+    expr.swap(if_expr);
 
     return false;
   }

src/util/simplify_expr_struct.cpp

@@ -10,6 +10,7 @@ Author: Daniel Kroening, [email protected]
 
 #include "arith_tools.h"
 #include "byte_operators.h"
+#include "expr_util.h"
 #include "invariant.h"
 #include "namespace.h"
 #include "pointer_offset_size.h"
@@ -276,15 +277,7 @@ bool simplify_exprt::simplify_member(exprt &expr)
   }
   else if(op.id()==ID_if)
   {
-    const if_exprt &if_expr=to_if_expr(op);
-    exprt cond=if_expr.cond();
-
-    member_exprt member_false=to_member_expr(expr);
-    member_false.compound()=if_expr.false_case();
-
-    to_member_expr(expr).compound()=if_expr.true_case();
-
-    expr=if_exprt(cond, expr, member_false, expr.type());
+    expr = lift_if(expr, 0);
     simplify_rec(expr);
 
     return false;