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.
This commit is contained in:
Eric Botcazou 2023-01-13 00:55:51 +01:00 committed by Marc Poulhiès
parent 3b4c6e6771
commit 9cfa7d7e3c

View file

@ -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);