Simplify object descriptor offset after construction

smowton · smowton · commit 992a3c39fe4f · 2019-02-13T18:09:45.000Z
Leaving this with trivially simplifiable expressions such as (0 + 0) means subsequent simplifications that
check for offset.is_constant() may be wrongly skipped.
diff --git a/src/util/std_expr.cpp b/src/util/std_expr.cpp
@@ -16,6 +16,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include "expr_util.h"
 #include "mathematical_types.h"
 #include "pointer_offset_size.h"
+#include "simplify_expr.h"
 
 bool constant_exprt::value_is_zero_string() const
 {
@@ -145,6 +146,7 @@ void object_descriptor_exprt::build(
     offset()=from_integer(0, index_type());
 
   build_object_descriptor_rec(ns, expr, *this);
+  simplify(offset(), ns);
 }
 
 shift_exprt::shift_exprt(

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ Author: Daniel Kroening, [email protected]`
`16`	`16`	`#include "expr_util.h"`
`17`	`17`	`#include "mathematical_types.h"`
`18`	`18`	`#include "pointer_offset_size.h"`
	`19`	`+#include "simplify_expr.h"`
`19`	`20`
`20`	`21`	`bool constant_exprt::value_is_zero_string() const`
`21`	`22`	`{`
`@@ -145,6 +146,7 @@ void object_descriptor_exprt::build(`
`145`	`146`	`offset()=from_integer(0, index_type());`
`146`	`147`
`147`	`148`	`build_object_descriptor_rec(ns, expr, *this);`
	`149`	`+ simplify(offset(), ns);`
`148`	`150`	`}`
`149`	`151`
`150`	`152`	`shift_exprt::shift_exprt(`