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-1485] [Ada] Cleanup repeated code for aggregate constraints checks Date: Tue, 5 Jul 2022 08:30:18 +0000 (GMT) [thread overview] Message-ID: <20220705083018.E1B0C385087F@sourceware.org> (raw) https://gcc.gnu.org/g:dd1c3433aa93d70d41d6c6cc1836249396413eab commit r13-1485-gdd1c3433aa93d70d41d6c6cc1836249396413eab Author: Piotr Trojanek <trojanek@adacore.com> Date: Mon Jun 6 14:01:35 2022 +0200 [Ada] Cleanup repeated code for aggregate constraints checks Code cleanup related to examining uses of Check_Unset_Reference for improved detection of uninitialised scalar objects. Semantics is unaffected. gcc/ada/ * sem_util.adb (Aggregate_Constraint_Checks): Fix whitespace; refactor repeated code; replace a ??? comment with an explanation based on the comment for the routine spec. Diff: --- gcc/ada/sem_util.adb | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 1b0b39befae..df9fed1c159 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -1153,7 +1153,7 @@ package body Sem_Util is (Exp : Node_Id; Check_Typ : Entity_Id) is - Exp_Typ : constant Entity_Id := Etype (Exp); + Exp_Typ : constant Entity_Id := Etype (Exp); begin if Raises_Constraint_Error (Exp) then @@ -1236,12 +1236,12 @@ package body Sem_Util is and then Is_Scalar_Type (Check_Typ) and then Exp_Typ /= Check_Typ then + -- If expression is a constant, it is worthwhile checking whether it + -- is a bound of the type. + if Is_Entity_Name (Exp) and then Ekind (Entity (Exp)) = E_Constant then - -- If expression is a constant, it is worthwhile checking whether - -- it is a bound of the type. - if (Is_Entity_Name (Type_Low_Bound (Check_Typ)) and then Entity (Exp) = Entity (Type_Low_Bound (Check_Typ))) or else @@ -1249,20 +1249,15 @@ package body Sem_Util is and then Entity (Exp) = Entity (Type_High_Bound (Check_Typ))) then return; - - else - Rewrite (Exp, Convert_To (Check_Typ, Relocate_Node (Exp))); - Analyze_And_Resolve (Exp, Check_Typ); - Check_Unset_Reference (Exp); end if; + end if; - -- Could use a comment on this case ??? + -- Change Exp into Check_Typ'(Exp) to ensure that range checks are + -- performed at run time. - else - Rewrite (Exp, Convert_To (Check_Typ, Relocate_Node (Exp))); - Analyze_And_Resolve (Exp, Check_Typ); - Check_Unset_Reference (Exp); - end if; + Rewrite (Exp, Convert_To (Check_Typ, Relocate_Node (Exp))); + Analyze_And_Resolve (Exp, Check_Typ); + Check_Unset_Reference (Exp); end if; end Aggregate_Constraint_Checks;
reply other threads:[~2022-07-05 8:30 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=20220705083018.E1B0C385087F@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).