> Well, yes, we have to fix it.
Here's the fix we agreed upon in the audit trail, OK for the mainline?
PR tree-optimization/104356
* match.pd (X / bool_range_Y is X): Add guard.
(X / X is one): Likewise.
(X / abs (X) is X < 0 ? -1 : 1): Likewise.
(X / -X is -1): Likewise.
(1 / X -> X == 1): Likewise.
--
Eric Botcazou
diff --git a/gcc/match.pd b/gcc/match.pd
index b942cb2930a..4b695db7a25 100644
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -401,27 +401,35 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
/* X / bool_range_Y is X. */
(simplify
(div @0 SSA_NAME@1)
- (if (INTEGRAL_TYPE_P (type) && ssa_name_has_boolean_range (@1))
+ (if (INTEGRAL_TYPE_P (type)
+ && ssa_name_has_boolean_range (@1)
+ && !flag_non_call_exceptions)
@0))
/* X / X is one. */
(simplify
(div @0 @0)
/* But not for 0 / 0 so that we can get the proper warnings and errors.
And not for _Fract types where we can't build 1. */
- (if (!integer_zerop (@0) && !ALL_FRACT_MODE_P (TYPE_MODE (type)))
+ (if (!integer_zerop (@0)
+ && (!flag_non_call_exceptions || tree_expr_nonzero_p (@0))
+ && !ALL_FRACT_MODE_P (TYPE_MODE (type)))
{ build_one_cst (type); }))
/* X / abs (X) is X < 0 ? -1 : 1. */
(simplify
(div:C @0 (abs @0))
(if (INTEGRAL_TYPE_P (type)
- && TYPE_OVERFLOW_UNDEFINED (type))
+ && TYPE_OVERFLOW_UNDEFINED (type)
+ && !integer_zerop (@0)
+ && (!flag_non_call_exceptions || tree_expr_nonzero_p (@0)))
(cond (lt @0 { build_zero_cst (type); })
{ build_minus_one_cst (type); } { build_one_cst (type); })))
/* X / -X is -1. */
(simplify
(div:C @0 (negate @0))
(if ((INTEGRAL_TYPE_P (type) || VECTOR_INTEGER_TYPE_P (type))
- && TYPE_OVERFLOW_UNDEFINED (type))
+ && TYPE_OVERFLOW_UNDEFINED (type)
+ && !integer_zerop (@0)
+ && (!flag_non_call_exceptions || tree_expr_nonzero_p (@0)))
{ build_minus_one_cst (type); })))
/* For unsigned integral types, FLOOR_DIV_EXPR is the same as
@@ -444,6 +452,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
(trunc_div integer_onep@0 @1)
(if (INTEGRAL_TYPE_P (type)
&& !integer_zerop (@1)
+ && (!flag_non_call_exceptions || tree_expr_nonzero_p (@1))
&& TYPE_PRECISION (type) > 1)
(if (TYPE_UNSIGNED (type))
(convert (eq:boolean_type_node @1 { build_one_cst (type); }))
