Simplify lhs before passing to symex_assign

Author: tautschnig

src/goto-symex/symex_assign.cpp

@@ -13,7 +13,8 @@ Author: Daniel Kroening, [email protected]
 
 #include <util/byte_operators.h>
 #include <util/cprover_prefix.h>
-
+#include <util/expr_util.h>
+#include <util/invariant.h>
 #include <util/c_types.h>
 
 #include "goto_symex_state.h"
@@ -27,6 +28,19 @@ void goto_symext::symex_assign_rec(
   code_assignt deref_code=code;
 
   clean_expr(deref_code.lhs(), state, true);
+  // make the structure of the lhs as simple as possible to avoid,
+  // e.g., (b ? s1 : s2).member=X resulting in
+  // (b ? s1 : s2)=(b ? s1 : s2) with member:=X and then
+  // s1=b ? ((b ? s1 : s2) with member:=X) : s1
+  // when all we need is
+  // s1=s1 with member:=X [and guard b]
+  // s2=s2 with member:=X [and guard !b]
+  do_simplify(deref_code.lhs());
+  // make sure simplify has not re-introduced any dereferencing that
+  // had previously been cleaned away
+  CHECK_RETURN(
+    !has_subexpr(deref_code.lhs(), ID_dereference),
+    "simplify re-introduced dereferencing");
   clean_expr(deref_code.rhs(), state, false);
 
   symex_assign(state, deref_code);