diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2019-08-19 08:35:58 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2019-08-19 08:35:58 +0000 |
| commit | 086734aed9adb3e46f362db83e9ea31571778b54 (patch) | |
| tree | 4d2e954e546d1ae914886d5b0264959db793fc6a /gcc | |
| parent | ef1c6c0e5499a83be7f86ccf64e3eb8814137cc9 (diff) | |
| download | gcc-086734aed9adb3e46f362db83e9ea31571778b54.zip gcc-086734aed9adb3e46f362db83e9ea31571778b54.tar.gz gcc-086734aed9adb3e46f362db83e9ea31571778b54.tar.bz2 | |
[Ada] Minor refactorings
2019-08-19 Piotr Trojanek <trojanek@adacore.com>
gcc/ada/
* sem_ch12.adb (Get_Unit_Instantiation_Node): Simplify Nkind_In
membership test.
* sem.adb (Depends_On_Main): Whitespace cleanup; only assign a
local variable if needed.
From-SVN: r274645
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/sem.adb | 8 | ||||
| -rw-r--r-- | gcc/ada/sem_ch12.adb | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d06fd4e..a2e9037 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2019-08-19 Piotr Trojanek <trojanek@adacore.com> + + * sem_ch12.adb (Get_Unit_Instantiation_Node): Simplify Nkind_In + membership test. + * sem.adb (Depends_On_Main): Whitespace cleanup; only assign a + local variable if needed. + 2019-08-19 Claire Dross <dross@adacore.com> * sem_spark.ads, sem_spark.adb (Is_Pledge_Function): New diff --git a/gcc/ada/sem.adb b/gcc/ada/sem.adb index 9b6b335..2e99531 100644 --- a/gcc/ada/sem.adb +++ b/gcc/ada/sem.adb @@ -1729,16 +1729,14 @@ package body Sem is MCU : constant Node_Id := Unit (Main_CU); begin - CL := First (Context_Items (CU)); - -- Problem does not arise with main subprograms - if - not Nkind_In (MCU, N_Package_Body, N_Package_Declaration) - then + if not Nkind_In (MCU, N_Package_Body, N_Package_Declaration) then return False; end if; + CL := First (Context_Items (CU)); + while Present (CL) loop if Nkind (CL) = N_With_Clause and then Library_Unit (CL) = Main_CU diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 5d1c824..e94fc21 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -8953,10 +8953,7 @@ package body Sem_Ch12 is Decl := Unit_Declaration_Node (Corresponding_Body (Decl)); end if; - if Nkind_In (Original_Node (Decl), N_Function_Instantiation, - N_Package_Instantiation, - N_Procedure_Instantiation) - then + if Nkind (Original_Node (Decl)) in N_Generic_Instantiation then return Original_Node (Decl); else return Unit (Parent (Decl)); |