public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-5211] ada: Fix latent bug exposed by recent work on extended return statements
@ 2023-01-16 14:48 Marc Poulhi?s
  0 siblings, 0 replies; only message in thread
From: Marc Poulhi?s @ 2023-01-16 14:48 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:9cfa7d7e3c3d7144a7b6079e7dc65a38a5327e70

commit r13-5211-g9cfa7d7e3c3d7144a7b6079e7dc65a38a5327e70
Author: Eric Botcazou <ebotcazou@adacore.com>
Date:   Fri Jan 13 00:55:51 2023 +0100

    ada: Fix latent bug exposed by recent work on extended return statements
    
    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.

Diff:
---
 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);

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-01-16 14:48 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-16 14:48 [gcc r13-5211] ada: Fix latent bug exposed by recent work on extended return statements Marc Poulhi?s

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).