diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2020-06-23 10:18:48 +0200 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2020-10-15 05:39:09 -0400 |
| commit | a39bc02543ee30ac995104e369adc84a08798709 (patch) | |
| tree | f16da5cc9715a03e30819fab314a658e0d19fb99 | |
| parent | fd11c7e6210fb05897d21f4b71c6ac457ac7515a (diff) | |
| download | gcc-a39bc02543ee30ac995104e369adc84a08798709.zip gcc-a39bc02543ee30ac995104e369adc84a08798709.tar.gz gcc-a39bc02543ee30ac995104e369adc84a08798709.tar.bz2 | |
[Ada] Simplify membership tests with N_Entity subtype
gcc/ada/
* sem_ch12.adb: Replace list of N_Defining_... enumerations with
N_Entity.
| -rw-r--r-- | gcc/ada/sem_ch12.adb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index cbf27e2..22e6371 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -8005,9 +8005,7 @@ package body Sem_Ch12 is end if; elsif No (Ent) - or else Nkind (Ent) not in N_Defining_Identifier - | N_Defining_Character_Literal - | N_Defining_Operator_Symbol + or else Nkind (Ent) not in N_Entity or else No (Scope (Ent)) or else (Scope (Ent) = Current_Instantiated_Parent.Gen_Id @@ -8174,9 +8172,7 @@ package body Sem_Ch12 is then Set_Entity (New_N, Entity (Name (Assoc))); - elsif Nkind (Assoc) in N_Defining_Identifier - | N_Defining_Character_Literal - | N_Defining_Operator_Symbol + elsif Nkind (Assoc) in N_Entity and then Expander_Active then -- Inlining case: we are copying a tree that contains @@ -15656,10 +15652,7 @@ package body Sem_Ch12 is -- preserve in this case, since the expansion will be redone in -- the instance. - if Nkind (E) not in N_Defining_Character_Literal - | N_Defining_Identifier - | N_Defining_Operator_Symbol - then + if Nkind (E) not in N_Entity then Set_Associated_Node (N, Empty); Set_Etype (N, Empty); return; |