public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-307] [Ada] Do not create useless itype in Constrain_Access Date: Wed, 11 May 2022 08:56:04 +0000 (GMT) [thread overview] Message-ID: <20220511085604.D7DD43839C49@sourceware.org> (raw) https://gcc.gnu.org/g:e6f7d5ff4f990c8f614c654353a3aa843f009349 commit r13-307-ge6f7d5ff4f990c8f614c654353a3aa843f009349 Author: Etienne Servais <servais@adacore.com> Date: Wed Feb 2 15:18:29 2022 +0100 [Ada] Do not create useless itype in Constrain_Access In the case of a constrained access definition for a record component we are calling create_itype twice the former not being updated. This leads to a malformed node that crashes -gnatG when predicates are activated. Instead of creating a default Itype for Desig_Subtype, create it with the correct scope in each case. gcc/ada/ * sem_ch3.adb (Constrain_Access): Call Desig_Subtype in each if branch to avoid calling it twice. Diff: --- gcc/ada/sem_ch3.adb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index d4464e2b8c9..6559c8fc7b7 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -13345,11 +13345,12 @@ package body Sem_Ch3 is is T : constant Entity_Id := Entity (Subtype_Mark (S)); Desig_Type : constant Entity_Id := Designated_Type (T); - Desig_Subtype : Entity_Id := Create_Itype (E_Void, Related_Nod); + Desig_Subtype : Entity_Id; Constraint_OK : Boolean := True; begin if Is_Array_Type (Desig_Type) then + Desig_Subtype := Create_Itype (E_Void, Related_Nod); Constrain_Array (Desig_Subtype, S, Related_Nod, Def_Id, 'P'); elsif (Is_Record_Type (Desig_Type) @@ -13445,12 +13446,14 @@ package body Sem_Ch3 is end; end if; + Desig_Subtype := Create_Itype (E_Void, Related_Nod); Constrain_Discriminated_Type (Desig_Subtype, S, Related_Nod, For_Access => True); elsif Is_Concurrent_Type (Desig_Type) and then not Is_Constrained (Desig_Type) then + Desig_Subtype := Create_Itype (E_Void, Related_Nod); Constrain_Concurrent (Desig_Subtype, S, Related_Nod, Desig_Type, ' '); else
reply other threads:[~2022-05-11 8:56 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=20220511085604.D7DD43839C49@sourceware.org \ --to=pmderodat@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).