From 7f0f5de19093d4550b48d3a26f1869e8def3f7e8 Mon Sep 17 00:00:00 2001 From: Justin Squirek Date: Wed, 14 Nov 2018 11:41:09 +0000 Subject: [Ada] Visibility error on used enumerated type This patch fixes an issue whereby the freezing of a nested package containing an enumerated type declaration would cause visibility errors on literals of such type when a use_all_type_clause for it appears within the same declarative region. 2018-11-14 Justin Squirek gcc/ada/ * sem_ch7.adb (Uninstall_Declarations): Add conditional to avoid uninstalling potential visibility during freezing on enumeration literals. gcc/testsuite/ * gnat.dg/enum5.adb: New testcase. From-SVN: r266119 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/sem_ch7.adb | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'gcc/ada') diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index dbd7ee3..2f23526 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2018-11-14 Justin Squirek + + * sem_ch7.adb (Uninstall_Declarations): Add conditional to avoid + uninstalling potential visibility during freezing on enumeration + literals. + 2018-11-14 Jerome Lambourg * env.c: Do not include crt_externs.h on iOS, as it does not diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb index 6e9f531..1c732b4 100644 --- a/gcc/ada/sem_ch7.adb +++ b/gcc/ada/sem_ch7.adb @@ -2820,8 +2820,9 @@ package body Sem_Ch7 is -- a) If the entity is an operator, it may be a primitive operator of -- a type for which there is a visible use-type clause. - -- b) for other entities, their use-visibility is determined by a - -- visible use clause for the package itself. For a generic instance, + -- b) For other entities, their use-visibility is determined by a + -- visible use clause for the package itself or a use-all-type clause + -- applied directly to the entity's type. For a generic instance, -- the instantiation of the formals appears in the visible part, -- but the formals are private and remain so. @@ -2854,6 +2855,16 @@ package body Sem_Ch7 is Set_Is_Potentially_Use_Visible (Id); end if; + -- We need to avoid incorrectly marking enumeration literals + -- as non-visible when a visible use-all-type clause is in effect. + + elsif Type_In_Use (Etype (Id)) + and then Nkind (Current_Use_Clause (Etype (Id))) = + N_Use_Type_Clause + and then All_Present (Current_Use_Clause (Etype (Id))) + then + null; + else Set_Is_Potentially_Use_Visible (Id, False); end if; -- cgit v1.1