mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-18 20:11:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Ada] Simplify membership tests with N_Entity subtype

Browse Source 
gcc/ada/

	* sem_ch12.adb: Replace list of N_Defining_... enumerations with
	N_Entity.
This commit is contained in:
Piotr Trojanek 2020-06-23 10:18:48 +02:00 committed by Pierre-Marie de Rodat
parent fd11c7e621
commit a39bc02543
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gcc/ada/sem_ch12.adb
View File

@ -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;