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-1440] [Ada] Enforce deferred constant completion rules Date: Mon, 4 Jul 2022 07:51:24 +0000 (GMT) [thread overview] Message-ID: <20220704075124.077C43850204@sourceware.org> (raw) https://gcc.gnu.org/g:f3451ba8aa3a54c6f09ee049a1a406603ed2ec30 commit r13-1440-gf3451ba8aa3a54c6f09ee049a1a406603ed2ec30 Author: Steve Baird <baird@adacore.com> Date: Wed May 25 17:21:39 2022 -0700 [Ada] Enforce deferred constant completion rules If a constrained subtype is given when a deferred constant is declared, then the subtype given in the completion is required (at compile time) to be subject to a statically matching constraint. This rule was not properly enforced in some cases and constructs that should have been rejected were incorrectly accepted. gcc/ada/ * sem_ch3.adb (Check_Possible_Deferred_Completion): Delete Prev_Obj_Def formal parameter. Reorganize code so that statically matching check is also performed in the case where the subtype given in the initial declaration is constrained and the subtype given in the completion is not. Diff: --- gcc/ada/sem_ch3.adb | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 84971e3c0b1..93aa2ca2b0f 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -13126,7 +13126,6 @@ package body Sem_Ch3 is procedure Check_Possible_Deferred_Completion (Prev_Id : Entity_Id; - Prev_Obj_Def : Node_Id; Curr_Obj_Def : Node_Id); -- Determine whether the two object definitions describe the partial -- and the full view of a constrained deferred constant. Generate @@ -13146,15 +13145,16 @@ package body Sem_Ch3 is procedure Check_Possible_Deferred_Completion (Prev_Id : Entity_Id; - Prev_Obj_Def : Node_Id; Curr_Obj_Def : Node_Id) is + Curr_Typ : Entity_Id; + Prev_Typ : constant Entity_Id := Etype (Prev_Id); + Anon_Acc : constant Boolean := Is_Anonymous_Access_Type (Prev_Typ); + Mismatch : Boolean := False; begin - if Nkind (Prev_Obj_Def) = N_Subtype_Indication - and then Present (Constraint (Prev_Obj_Def)) - and then Nkind (Curr_Obj_Def) = N_Subtype_Indication - and then Present (Constraint (Curr_Obj_Def)) - then + if Anon_Acc then + null; + elsif Nkind (Curr_Obj_Def) = N_Subtype_Indication then declare Loc : constant Source_Ptr := Sloc (N); Def_Id : constant Entity_Id := Make_Temporary (Loc, 'S'); @@ -13167,13 +13167,32 @@ package body Sem_Ch3 is begin Insert_Before_And_Analyze (N, Decl); Set_Etype (Id, Def_Id); - - if not Subtypes_Statically_Match (Etype (Prev_Id), Def_Id) then - Error_Msg_Sloc := Sloc (Prev_Id); - Error_Msg_N ("subtype does not statically match deferred " - & "declaration #", N); - end if; + Curr_Typ := Def_Id; end; + else + Curr_Typ := Etype (Curr_Obj_Def); + end if; + + if Anon_Acc then + if Nkind (Curr_Obj_Def) /= N_Access_Definition then + Mismatch := True; + elsif Has_Null_Exclusion (Prev_Typ) + and then not Null_Exclusion_Present (Curr_Obj_Def) + then + Mismatch := True; + end if; + -- ??? Another check needed: mismatch if disagreement + -- between designated types/profiles . + else + Mismatch := + Is_Constrained (Prev_Typ) + and then not Subtypes_Statically_Match (Prev_Typ, Curr_Typ); + end if; + + if Mismatch then + Error_Msg_Sloc := Sloc (Prev_Id); + Error_Msg_N ("subtype does not statically match deferred " + & "declaration #", N); end if; end Check_Possible_Deferred_Completion; @@ -13316,7 +13335,6 @@ package body Sem_Ch3 is Check_Possible_Deferred_Completion (Prev_Id => Prev, - Prev_Obj_Def => Object_Definition (Parent (Prev)), Curr_Obj_Def => Obj_Def); Set_Full_View (Prev, Id);
reply other threads:[~2022-07-04 7:51 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=20220704075124.077C43850204@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).