re PR ada/80590 (non-bootstrap build failure of Ada runtime)

PR ada/80590

	* exp_ch9.adb (Expand_N_Delay_Relative_Statement): Swap the two
	conditions to avoid a unnecessary exception propagation in the default
	case.

From-SVN: r272372
This commit is contained in:
Arnaud Charlet 2019-06-17 07:32:14 +00:00 committed by Arnaud Charlet
parent 21e42f7bc1
commit 61efadedfd
2 changed files with 15 additions and 8 deletions

View File

@ -1,3 +1,11 @@
2019-06-17 Arnaud Charlet <charlet@adacore.com>
PR ada/80590
* exp_ch9.adb (Expand_N_Delay_Relative_Statement): Swap the two
conditions to avoid a unnecessary exception propagation in the default
case.
2019-05-28 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/utils.c (handle_stack_protect_attribute): Move around.

View File

@ -8258,18 +8258,17 @@ package body Exp_Ch9 is
Proc : Entity_Id;
begin
-- Try to use System.Relative_Delays.Delay_For only if available. This
-- is the implementation used on restricted platforms when Ada.Calendar
-- is not available.
-- Try to use Ada.Calendar.Delays.Delay_For if available.
if RTE_Available (RO_RD_Delay_For) then
Proc := RTE (RO_RD_Delay_For);
if RTE_Available (RO_CA_Delay_For) then
Proc := RTE (RO_CA_Delay_For);
-- Otherwise, use Ada.Calendar.Delays.Delay_For and emit an error
-- message if not available.
-- Otherwise, use System.Relative_Delays.Delay_For and emit an error
-- message if not available. This is the implementation used on
-- restricted platforms when Ada.Calendar is not available.
else
Proc := RTE (RO_CA_Delay_For);
Proc := RTE (RO_RD_Delay_For);
end if;
Rewrite (N,