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.
Tested on x86_64-pc-linux-gnu, committed on trunk
2018-11-14 Justin Squirek <squi...@adacore.com>
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.--- gcc/ada/sem_ch7.adb
+++ 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;
--- /dev/null
new file mode 100644
+++ gcc/testsuite/gnat.dg/enum5.adb
@@ -0,0 +1,11 @@
+-- { dg-do compile }
+
+procedure Enum5 is
+ package Pack1 is
+ type Enum is (A, B, C);
+ end;
+ E1 : Pack1.Enum;
+ use all type Pack1.Enum;
+begin
+ E1 := A;
+end;
