From: Eric Botcazou <ebotcazou@adacore.com>
Date: Mon, 12 Jun 2023 10:36:56 +0000 (+0200)
Subject: ada: Plug another loophole in the handling of private views in instances
X-Git-Tag: basepoints/gcc-15~8015
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=125a2260ce07e384238f8569c77d07c56762d39c;p=thirdparty%2Fgcc.git

ada: Plug another loophole in the handling of private views in instances

This deals with discriminants of types declared in package bodies.

gcc/ada/

	* sem_ch12.adb (Check_Private_View): Also check the type of
	visible discriminants in record and concurrent types.
---

diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index d5280cea7127..fbfc2db7f9a2 100644
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -7710,6 +7710,9 @@ package body Sem_Ch12 is
             Prepend_Elmt (Typ, Exchanged_Views);
             Exchange_Declarations (Etype (Get_Associated_Node (N)));
 
+         --  Check that the available views of Typ match their respective flag.
+         --  Note that the type of a visible discriminant is never private.
+
          else
             Check_Private_Type (Typ, Has_Private_View (N));
 
@@ -7720,6 +7723,20 @@ package body Sem_Ch12 is
             elsif Is_Array_Type (Typ) then
                Check_Private_Type
                  (Component_Type (Typ), Has_Secondary_Private_View (N));
+
+            elsif (Is_Record_Type (Typ) or else Is_Concurrent_Type (Typ))
+              and then Has_Discriminants (Typ)
+            then
+               declare
+                  Disc : Entity_Id;
+
+               begin
+                  Disc := First_Discriminant (Typ);
+                  while Present (Disc) loop
+                     Check_Private_Type (Etype (Disc), False);
+                     Next_Discriminant (Disc);
+                  end loop;
+               end;
             end if;
          end if;
       end if;