Use binary_overflow_exprt in simplify_exprt::simplify_node

thomasspriggs · thomasspriggs · commit 98c80dc67e6e · 2022-03-22T21:01:26.000Z
diff --git a/src/util/simplify_expr.cpp b/src/util/simplify_expr.cpp
@@ -2547,10 +2547,10 @@ simplify_exprt::resultt<> simplify_exprt::simplify_node(exprt node)
     r = simplify_complex(to_unary_expr(expr));
   }
   else if(
-    expr.id() == ID_overflow_plus || expr.id() == ID_overflow_minus ||
-    expr.id() == ID_overflow_mult || expr.id() == ID_overflow_shl)
+    const auto binary_overflow =
+      expr_try_dynamic_cast<binary_overflow_exprt>(expr))
   {
-    r = simplify_overflow_binary(to_binary_overflow_expr(expr));
+    r = simplify_overflow_binary(*binary_overflow);
   }
   else if(expr.id() == ID_overflow_unary_minus)
   {

Original file line number	Diff line number	Diff line change
`@@ -2547,10 +2547,10 @@ simplify_exprt::resultt<> simplify_exprt::simplify_node(exprt node)`
`2547`	`2547`	`r = simplify_complex(to_unary_expr(expr));`
`2548`	`2548`	`}`
`2549`	`2549`	`else if(`
`2550`		`- expr.id() == ID_overflow_plus \|\| expr.id() == ID_overflow_minus \|\|`
`2551`		`- expr.id() == ID_overflow_mult \|\| expr.id() == ID_overflow_shl)`
	`2550`	`+ const auto binary_overflow =`
	`2551`	`+ expr_try_dynamic_cast<binary_overflow_exprt>(expr))`
`2552`	`2552`	`{`
`2553`		`- r = simplify_overflow_binary(to_binary_overflow_expr(expr));`
	`2553`	`+ r = simplify_overflow_binary(*binary_overflow);`
`2554`	`2554`	`}`
`2555`	`2555`	`else if(expr.id() == ID_overflow_unary_minus)`
`2556`	`2556`	`{`