Merge pull request #5744 from tautschnig/simplify-cleanup-3

tautschnig · web-flow · commit 8b649740b16e · 2021-01-14T22:48:19.000+01:00
Make eliminate_common_addends file-local
diff --git a/src/util/simplify_expr_class.h b/src/util/simplify_expr_class.h
@@ -205,7 +205,6 @@ class simplify_exprt
   bool simplify_if_disj(exprt &expr, const exprt &cond);
   bool simplify_if_branch(exprt &trueexpr, exprt &falseexpr, const exprt &cond);
   bool simplify_if_cond(exprt &expr);
-  bool eliminate_common_addends(exprt &op0, exprt &op1);
   static tvt objects_equal(const exprt &a, const exprt &b);
   static tvt objects_equal_address_of(const exprt &a, const exprt &b);
   NODISCARD resultt<> simplify_address_of_arg(const exprt &);
diff --git a/src/util/simplify_expr_int.cpp b/src/util/simplify_expr_int.cpp
@@ -1413,9 +1413,7 @@ simplify_exprt::resultt<> simplify_exprt::simplify_inequality_both_constant(
   }
 }
 
-bool simplify_exprt::eliminate_common_addends(
-  exprt &op0,
-  exprt &op1)
+static bool eliminate_common_addends(exprt &op0, exprt &op1)
 {
   // we can't eliminate zeros
   if(op0.is_zero() ||

Original file line number	Diff line number	Diff line change
`@@ -1413,9 +1413,7 @@ simplify_exprt::resultt<> simplify_exprt::simplify_inequality_both_constant(`
`1413`	`1413`	`}`
`1414`	`1414`	`}`
`1415`	`1415`
`1416`		`-bool simplify_exprt::eliminate_common_addends(`
`1417`		`- exprt &op0,`
`1418`		`- exprt &op1)`
	`1416`	`+static bool eliminate_common_addends(exprt &op0, exprt &op1)`
`1419`	`1417`	`{`
`1420`	`1418`	`// we can't eliminate zeros`
`1421`	`1419`	`if(op0.is_zero() \|\|`