https://gcc.gnu.org/g:f6d20900a2f358b007cfd47636bfb696aeab0d4c
commit r16-1223-gf6d20900a2f358b007cfd47636bfb696aeab0d4c
Author: Eric Botcazou <ebotca...@adacore.com>
Date: Fri Feb 21 10:03:22 2025 +0100
ada: Fix wrong initialization of library-level object by conditional
expression
At library level the object must be allocated statically and with its bounds
when its nominal subtype is an unconstrained array type.
gcc/ada/ChangeLog:
* exp_ch4.adb (Insert_Conditional_Object_Declaration): Make sure the
object is allocated properly by the code generator at library level.
Diff:
---
gcc/ada/exp_ch4.adb | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index 88e5f360bbfa..01be3dff89bc 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -13301,10 +13301,12 @@ package body Exp_Ch4 is
Obj_Decl : constant Node_Id :=
Make_Object_Declaration (Loc,
Defining_Identifier => Obj_Id,
- Aliased_Present => Aliased_Present (Decl),
+ Aliased_Present => True,
Constant_Present => Constant_Present (Decl),
Object_Definition => New_Copy_Tree (Object_Definition (Decl)),
Expression => Relocate_Node (Expr));
+ -- We make the object unconditionally aliased to avoid dangling bound
+ -- issues when its nominal subtype is an unconstrained array type.
Master_Node_Decl : Node_Id;
Master_Node_Id : Entity_Id;
@@ -13319,6 +13321,11 @@ package body Exp_Ch4 is
Insert_Action (Expr, Obj_Decl);
+ -- The object can never be local to an elaboration routine at library
+ -- level since we will take 'Unrestricted_Access of it.
+
+ Set_Is_Statically_Allocated (Obj_Id, Is_Library_Level_Entity (Obj_Id));
+
-- If the object needs finalization, we need to insert its Master_Node
-- manually because 1) the machinery in Exp_Ch7 will not pick it since
-- it will be declared in the arm of a conditional statement and 2) we
