Improve the simplification of the constant domain.

Author: Martin Brain

src/analyses/constant_propagator.cpp

@@ -334,6 +334,26 @@ void constant_propagator_domaint::assign(
 
 /*******************************************************************\
 
+Function: constant_propagator_domaint::assign
+
+  Inputs: The condition to simplify and its namespace.
+
+ Outputs: The simplified condition.
+
+ Purpose: Simplify the condition given context-sensitive knowledge from the domain.
+
+\*******************************************************************/
+
+exprt constant_propagator_domaint::domain_simplify (const exprt &condition,
+						    const namespacet &ns)
+{
+  exprt e(condition);
+  values.replace_const(e);
+  return simplify_expr(e, ns);
+}
+
+/*******************************************************************\
+
 Function: constant_propagator_domaint::is_array_constant
 
   Inputs:

src/analyses/constant_propagator.h

@@ -19,6 +19,7 @@ class constant_propagator_domaint:public ai_domain_baset
   virtual void transform(locationt, locationt, ai_baset &, const namespacet &);
   virtual void output(std::ostream &, const ai_baset &, const namespacet &) const;
   bool merge(const constant_propagator_domaint &, locationt, locationt);
+  virtual exprt domain_simplify (const exprt &condition, const namespacet &ns);
 
   struct valuest
   {