diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2023-05-31 14:32:59 +0200 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2023-06-20 09:30:49 +0200 |
| commit | d39664b659f2442a456be865ee6adcfe1a4a5aed (patch) | |
| tree | c6ed65d18918a04db241d09be282d11680c0ed10 | |
| parent | b9b1dcc841436964d344befe38ef66c5ee68913d (diff) | |
| download | gcc-d39664b659f2442a456be865ee6adcfe1a4a5aed.zip gcc-d39664b659f2442a456be865ee6adcfe1a4a5aed.tar.gz gcc-d39664b659f2442a456be865ee6adcfe1a4a5aed.tar.bz2 | |
ada: Fix fallout of fix to handling of private views in instances
Check_Actual_Type incorrectly switches the view of a private type declared
in the enclosing scope of a generic unit but that has a private ancestor.
gcc/ada/
* einfo.ads (Has_Private_Ancestor): Fix inaccuracy in description.
* sem_ch12.adb (Check_Actual_Type): Do not switch the view of the
type if it has a private ancestor.
| -rw-r--r-- | gcc/ada/einfo.ads | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_ch12.adb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads index a861ff7..b356b76 100644 --- a/gcc/ada/einfo.ads +++ b/gcc/ada/einfo.ads @@ -1969,7 +1969,7 @@ package Einfo is -- is defined for the type. -- Has_Private_Ancestor --- Applies to type extensions. True if some ancestor is derived from a +-- Applies to derived record types. True if an ancestor is derived from a -- private type, making some components invisible and aggregates illegal. -- This flag is set at the point of derivation. The legality of the -- aggregate must be rechecked because it also depends on the visibility diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index a65bd0f..a8e7c90 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -6980,7 +6980,8 @@ package body Sem_Ch12 is procedure Check_Actual_Type (Typ : Entity_Id); -- If the type of the actual is a private type declared in the - -- enclosing scope of the generic unit, the body of the generic + -- enclosing scope of the generic unit, but not a derived type + -- of a private type declared elsewhere, the body of the generic -- sees the full view of the type (because it has to appear in -- the corresponding package body). If the type is private now, -- exchange views to restore the proper visibility in the instance. @@ -6999,6 +7000,7 @@ package body Sem_Ch12 is if Is_Private_Type (Btyp) and then Scope (Btyp) = Parent_Scope + and then not Has_Private_Ancestor (Btyp) and then Ekind (Parent_Scope) in E_Package | E_Generic_Package and then Scope (Instance) /= Parent_Scope and then not Is_Child_Unit (Gen_Id) |