This eliminates redundant overflow checks that are generated for
conversions from fixed-point to integer types when range checks are also
enabled (which is the default), as the former checks are subsumed into
the latter checks.
No functional changes.
Tested on x86_64-pc-linux-gnu, committed on trunk
2019-07-23 Eric Botcazou <ebotca...@adacore.com>
gcc/ada/
* checks.adb (Activate_Overflow_Check): Remove redundant
argument.
* exp_ch4.adb (Discrete_Range_Check): Reset the overflow flag.
(Expand_N_Type_Conversion): Do not reset it here.--- gcc/ada/checks.adb
+++ gcc/ada/checks.adb
@@ -435,7 +435,7 @@ package body Checks is
-- Fall through for cases where we do set the flag
- Set_Do_Overflow_Check (N, True);
+ Set_Do_Overflow_Check (N);
Possible_Local_Raise (N, Standard_Constraint_Error);
end Activate_Overflow_Check;
--- gcc/ada/exp_ch4.adb
+++ gcc/ada/exp_ch4.adb
@@ -11000,6 +11000,11 @@ package body Exp_Ch4 is
Rewrite (Expr, Unchecked_Convert_To (Ityp, Expr));
end if;
+ -- Reset overflow flag, since the range check will include
+ -- dealing with possible overflow, and generate the check.
+
+ Set_Do_Overflow_Check (N, False);
+
Generate_Range_Check (Expr, Target_Type, CE_Range_Check_Failed);
end Discrete_Range_Check;
@@ -12096,11 +12101,6 @@ package body Exp_Ch4 is
or else (Is_Fixed_Point_Type (Etype (Expression (N)))
and then Conversion_OK (N)))
then
- -- Reset overflow flag, since the range check will include
- -- dealing with possible overflow, and generate the check.
-
- Set_Do_Overflow_Check (N, False);
-
-- If Address is either a source type or target type,
-- suppress range check to avoid typing anomalies when
-- it is a visible integer type.
