From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 12 Jan 2023 23:55:51 +0000 (+0100)
Subject: ada: Fix latent bug exposed by recent work on extended return statements
X-Git-Tag: basepoints/gcc-14~1996
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cfa7d7e3c3d7144a7b6079e7dc65a38a5327e70;p=thirdparty%2Fgcc.git

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 --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index 6886bde7bd1c..daa96df4b32c 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);