From: "Marc Poulhiès" <poulhies@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Eric Botcazou <ebotcazou@adacore.com>
Subject: [COMMITTED] ada: Fix latent bug exposed by recent work on extended return statements
Date: Mon, 16 Jan 2023 15:49:23 +0100 [thread overview]
Message-ID: <20230116144923.3171796-1-poulhies@adacore.com> (raw)
From: Eric Botcazou <ebotcazou@adacore.com>
When the type of the return object is a constrained array, there may be an
implicit sliding that needs to be preserved during the expansion.
gcc/ada/
* exp_ch3.adb (Make_Allocator_For_Return): Convert the expression
to the return object's type in the constrained array case as well.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/exp_ch3.adb | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index 6886bde7bd1..daa96df4b32 100644
--- a/gcc/ada/exp_ch3.adb
+++ b/gcc/ada/exp_ch3.adb
@@ -7181,11 +7181,13 @@ package body Exp_Ch3 is
Alloc_Expr := New_Copy_Tree (Expr);
+ -- In the constrained array case, deal with a potential sliding.
-- In the interface case, put back a conversion that we may have
- -- remove earlier in the processing.
+ -- removed earlier in the processing.
- if Is_Interface (Typ)
- and then Is_Class_Wide_Type (Etype (Alloc_Expr))
+ if (Ekind (Typ) = E_Array_Subtype
+ or else (Is_Interface (Typ)
+ and then Is_Class_Wide_Type (Etype (Alloc_Expr))))
and then Typ /= Etype (Alloc_Expr)
then
Alloc_Expr := Convert_To (Typ, Alloc_Expr);
--
2.34.1
reply other threads:[~2023-01-16 14:49 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=20230116144923.3171796-1-poulhies@adacore.com \
--to=poulhies@adacore.com \
--cc=ebotcazou@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).