diff mbox series

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

Message ID 20230522084938.1725583-1-poulhies@adacore.com
State Accepted
Headers
Series [COMMITTED] ada: Fix handling of constrained array declarations in declare-expression |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Marc Poulhiès May 22, 2023, 8:49 a.m. UTC 
  From: Eric Botcazou <ebotcazou@adacore.com>

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.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/sem_ch3.adb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 66013ca0134..7596a59edb9 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));