public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Marc Poulhi?s <dkm@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-1971] ada: Fix fallout of fix to handling of private views in instances Date: Tue, 20 Jun 2023 07:46:42 +0000 (GMT) [thread overview] Message-ID: <20230620074642.0AB5A385842C@sourceware.org> (raw) https://gcc.gnu.org/g:d39664b659f2442a456be865ee6adcfe1a4a5aed commit r14-1971-gd39664b659f2442a456be865ee6adcfe1a4a5aed Author: Eric Botcazou <ebotcazou@adacore.com> Date: Wed May 31 14:32:59 2023 +0200 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. Diff: --- gcc/ada/einfo.ads | 2 +- 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 a861ff787a4..b356b76f0de 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 a65bd0fdfb5..a8e7c909c39 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)
reply other threads:[~2023-06-20 7:46 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230620074642.0AB5A385842C@sourceware.org \ --to=dkm@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).