From: Eric Botcazou <ebotcazou@adacore.com>
Date: Tue, 31 Jan 2023 13:33:44 +0000 (+0100)
Subject: ada: Fix handling of constrained array declarations in declare-expression
X-Git-Tag: basepoints/gcc-15~9102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5105de335368f88cb75acbc9bd30984bd49469c1;p=thirdparty%2Fgcc.git

ada: Fix handling of constrained array declarations in declare-expression

They need to go through Constrain_Array or else they do not really work.

gcc/ada/

	* sem_ch3.adb (Find_Type_Of_Object): In a spec expression, also set
	the Scope of the type, and call Constrain_Array for array subtypes.
---

diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 66013ca01346..7596a59edb98 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -18417,10 +18417,10 @@ package body Sem_Ch3 is
                Set_Etype  (T, Base_T);
                Mutate_Ekind  (T, Subtype_Kind (Ekind (Base_T)));
                Set_Parent (T, Obj_Def);
+               Set_Scope (T, Current_Scope);
 
                if Ekind (T) = E_Array_Subtype then
-                  Set_First_Index (T, First_Index (Base_T));
-                  Set_Is_Constrained (T);
+                  Constrain_Array (T, Obj_Def, Related_Nod, T, 'P');
 
                elsif Ekind (T) = E_Record_Subtype then
                   Set_First_Entity (T, First_Entity (Base_T));