aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2020-11-29 22:30:17 +0100
committerPierre-Marie de Rodat <derodat@adacore.com>2020-12-16 08:01:03 -0500
commit2c623ed86a387bcef5d1d0b7286d2df6d332ef06 (patch)
tree1da4c922c28495b2079f533c00c5513f003c6b39
parent612c48b13b38c42094059350d945f9d29983491a (diff)
downloadgcc-2c623ed86a387bcef5d1d0b7286d2df6d332ef06.zip
gcc-2c623ed86a387bcef5d1d0b7286d2df6d332ef06.tar.gz
gcc-2c623ed86a387bcef5d1d0b7286d2df6d332ef06.tar.bz2
[Ada] Simplify membership tests with N_Delay_Statement subtype
gcc/ada/ * exp_ch9.adb, sem_warn.adb: Simplify membership test.
-rw-r--r--gcc/ada/exp_ch9.adb3
-rw-r--r--gcc/ada/sem_warn.adb4
2 files changed, 2 insertions, 5 deletions
diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb
index 525eee9..b055b27 100644
--- a/gcc/ada/exp_ch9.adb
+++ b/gcc/ada/exp_ch9.adb
@@ -7161,8 +7161,7 @@ package body Exp_Ch9 is
if Ada_Version >= Ada_2005
and then
(No (Original_Node (Ecall))
- or else Nkind (Original_Node (Ecall)) not in
- N_Delay_Relative_Statement | N_Delay_Until_Statement)
+ or else Nkind (Original_Node (Ecall)) not in N_Delay_Statement)
then
Extract_Dispatching_Call (Ecall, Call_Ent, Obj, Actuals, Formals);
diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb
index d92975f..b5275a8 100644
--- a/gcc/ada/sem_warn.adb
+++ b/gcc/ada/sem_warn.adb
@@ -750,9 +750,7 @@ package body Sem_Warn is
Fstm : constant Node_Id :=
Original_Node (First (Statements (Loop_Statement)));
begin
- if Nkind (Fstm) = N_Delay_Relative_Statement
- or else Nkind (Fstm) = N_Delay_Until_Statement
- then
+ if Nkind (Fstm) in N_Delay_Statement then
return;
end if;
end;