From d8394e2aa265c9e06b8362a84e77270dd182f638 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 23 Jun 2020 10:39:12 -0400 Subject: [Ada] Spurious visibility on private with package gcc/ada/ * sem_ch10.adb (Install_With_Clause): Fix implementation of Ada 2005 AI-262 by taking into account generic packages. Minor reformatting. * libgnat/a-cbhase.ads, libgnat/a-cbhase.adb: Remove use clause on runtime unit spec. --- gcc/ada/libgnat/a-cbhase.adb | 1 + gcc/ada/libgnat/a-cbhase.ads | 4 ++-- gcc/ada/sem_ch10.adb | 14 ++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gcc/ada/libgnat/a-cbhase.adb b/gcc/ada/libgnat/a-cbhase.adb index a332bd7..0950553 100644 --- a/gcc/ada/libgnat/a-cbhase.adb +++ b/gcc/ada/libgnat/a-cbhase.adb @@ -42,6 +42,7 @@ with System; use type System.Address; package body Ada.Containers.Bounded_Hashed_Sets with SPARK_Mode => Off is + use Ada.Finalization; pragma Warnings (Off, "variable ""Busy*"" is not referenced"); pragma Warnings (Off, "variable ""Lock*"" is not referenced"); diff --git a/gcc/ada/libgnat/a-cbhase.ads b/gcc/ada/libgnat/a-cbhase.ads index 32e9d92..2d8a7ee 100644 --- a/gcc/ada/libgnat/a-cbhase.ads +++ b/gcc/ada/libgnat/a-cbhase.ads @@ -36,7 +36,7 @@ with Ada.Iterator_Interfaces; private with Ada.Containers.Hash_Tables; with Ada.Containers.Helpers; private with Ada.Streams; -private with Ada.Finalization; use Ada.Finalization; +private with Ada.Finalization; generic type Element_Type is private; @@ -592,7 +592,7 @@ private No_Element : constant Cursor := (Container => null, Node => 0); - type Iterator is new Limited_Controlled and + type Iterator is new Ada.Finalization.Limited_Controlled and Set_Iterator_Interfaces.Forward_Iterator with record Container : Set_Access; diff --git a/gcc/ada/sem_ch10.adb b/gcc/ada/sem_ch10.adb index 76b68a1..9749fd4 100644 --- a/gcc/ada/sem_ch10.adb +++ b/gcc/ada/sem_ch10.adb @@ -5303,8 +5303,9 @@ package body Sem_Ch10 is -- analyzing the private part of the package). if Private_Present (With_Clause) - and then Nkind (Unit (Parent (With_Clause))) = N_Package_Declaration - and then not (Private_With_OK) + and then Nkind (Unit (Parent (With_Clause))) + in N_Package_Declaration | N_Generic_Package_Declaration + and then not Private_With_OK then return; end if; @@ -5371,7 +5372,7 @@ package body Sem_Ch10 is Set_Is_Visible_Lib_Unit (Uname); -- If the unit is a wrapper package for a compilation unit that is - -- a subprogrm instance, indicate that the instance itself is a + -- a subprogram instance, indicate that the instance itself is a -- visible unit. This is necessary if the instance is inlined. if Is_Wrapper_Package (Uname) then @@ -6464,7 +6465,7 @@ package body Sem_Ch10 is null; elsif Nkind (Item) = N_With_Clause - and then Context_Installed (Item) + and then Context_Installed (Item) then -- Remove items from one with'ed unit @@ -6818,12 +6819,12 @@ package body Sem_Ch10 is -- In_Regular_With_Clause -- ---------------------------- - function In_Regular_With_Clause (E : Entity_Id) return Boolean - is + function In_Regular_With_Clause (E : Entity_Id) return Boolean is Item : Node_Id; begin Item := First (Context_Items (Comp_Unit)); + while Present (Item) loop if Nkind (Item) = N_With_Clause @@ -6836,6 +6837,7 @@ package body Sem_Ch10 is then return True; end if; + Next (Item); end loop; -- cgit v1.1