diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2023-01-13 00:55:51 +0100 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2023-01-16 15:44:55 +0100 |
| commit | 9cfa7d7e3c3d7144a7b6079e7dc65a38a5327e70 (patch) | |
| tree | ed8644e02ed19d66eefceef5e38951395f62501e /gcc | |
| parent | 3b4c6e67710b09beccb7d0acf7f7257564d8a6f5 (diff) | |
| download | gcc-9cfa7d7e3c3d7144a7b6079e7dc65a38a5327e70.zip gcc-9cfa7d7e3c3d7144a7b6079e7dc65a38a5327e70.tar.gz gcc-9cfa7d7e3c3d7144a7b6079e7dc65a38a5327e70.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/exp_ch3.adb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index 6886bde..daa96df 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); |