From: Pierre-Marie de Rodat <derodat@adacore.com>
To: gcc-patches@gcc.gnu.org
Subject: [Ada] Rework optimization skipping pragma check in object declaration
Date: Wed, 18 May 2022 08:43:10 +0000 [thread overview]
Message-ID: <20220518084310.GA3318962@adacore.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 685 bytes --]
When an object declaration is initialized with a type conversion:
Var : Typ := Typ (Value);
we skip the check for Typ's predicate as it is already checked
during the type conversion.
This is not correct when Var's subtype and the target subtype of the
conversion do not statically match:
Var : Typ := OtherTyp (Value);
In such case, we can't skip the check of Typ's predicate.
Fix minor typos in comment.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* sem_ch3.adb (Analyze_Object_Declaration): Skip predicate check
for type conversion if object's subtype and expression's subtype
statically match.
* exp_prag.adb (Expand_Pragma_Check): Typo fix in comment.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 1751 bytes --]
diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb
--- a/gcc/ada/exp_prag.adb
+++ b/gcc/ada/exp_prag.adb
@@ -285,7 +285,7 @@ package body Exp_Prag is
-- expression is not usually the best choice here, because it points to
-- the location of the topmost tree node, which may be an operator in
-- the middle of the source text of the expression. For example, it gets
- -- located on the last AND keyword in a chain of boolean expressiond
+ -- located on the last AND keyword in a chain of boolean expressions
-- AND'ed together. It is best to put the message on the first character
-- of the condition, which is the effect of the First_Node call here.
-- This source location is used to build the default exception message,
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -4572,11 +4572,15 @@ package body Sem_Ch3 is
null;
-- Do not generate a predicate check if the initialization expression
- -- is a type conversion because the conversion has been subjected to
- -- the same check. This is a small optimization which avoid redundant
+ -- is a type conversion whose target subtype statically matches the
+ -- object's subtype because the conversion has been subjected to the
+ -- same check. This is a small optimization which avoids redundant
-- checks.
- elsif Present (E) and then Nkind (E) = N_Type_Conversion then
+ elsif Present (E)
+ and then Nkind (E) in N_Type_Conversion
+ and then Subtypes_Statically_Match (Etype (Subtype_Mark (E)), T)
+ then
null;
else
reply other threads:[~2022-05-18 8:43 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=20220518084310.GA3318962@adacore.com \
--to=derodat@adacore.com \
--cc=gcc-patches@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: link
Be 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).