diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2022-06-03 10:02:56 +0200 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2022-07-06 13:29:49 +0000 |
| commit | 40242ebb71ed7a03ab23349a893afe6140c512d1 (patch) | |
| tree | 7f0aa218daf1d9e6de297eb74d75608d5cb3eacd /gcc/ada/gcc-interface/decl.cc | |
| parent | 940bbc4363b4cee9682a96e17fbb536f61c50c21 (diff) | |
| download | gcc-40242ebb71ed7a03ab23349a893afe6140c512d1.zip gcc-40242ebb71ed7a03ab23349a893afe6140c512d1.tar.gz gcc-40242ebb71ed7a03ab23349a893afe6140c512d1.tar.bz2 | |
[Ada] Fix crash on aliased renaming of unconstrained array
gcc/ada/
* gcc-interface/decl.cc (gnat_to_gnu_entity) <E_Variable>: Create a
local constant holding the underlying GNAT type of the object. Do
not fiddle with the object size for an unconstrained array.
Diffstat (limited to 'gcc/ada/gcc-interface/decl.cc')
| -rw-r--r-- | gcc/ada/gcc-interface/decl.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc index e7e5ad5..3f6b88a 100644 --- a/gcc/ada/gcc-interface/decl.cc +++ b/gcc/ada/gcc-interface/decl.cc @@ -711,6 +711,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) case E_Variable: { const Entity_Id gnat_type = Etype (gnat_entity); + const Entity_Id gnat_und_type = Underlying_Type (gnat_type); /* Always create a variable for volatile objects and variables seen constant but with a Linker_Section pragma. */ bool const_flag @@ -749,7 +750,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) } /* Get the type after elaborating the renamed object. */ - if (foreign && Is_Descendant_Of_Address (Underlying_Type (gnat_type))) + if (foreign && Is_Descendant_Of_Address (gnat_und_type)) gnu_type = ptr_type_node; else gnu_type = gnat_to_gnu_type (gnat_type); @@ -947,7 +948,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) subtype, make a type that includes the template. We will either allocate or create a variable of that type, see below. */ if (Is_Constr_Subt_For_UN_Aliased (gnat_type) - && Is_Array_Type (Underlying_Type (gnat_type)) + && Is_Array_Type (gnat_und_type) && !type_annotate_only) { tree gnu_array = gnat_to_gnu_type (Base_Type (gnat_type)); @@ -996,8 +997,9 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) /* If the object is aliased, of a constrained nominal subtype and its size might be zero at run time, we force at least the unit size. */ if (Is_Aliased (gnat_entity) + && Is_Constrained (gnat_type) && !Is_Constr_Subt_For_UN_Aliased (gnat_type) - && Is_Array_Type (Underlying_Type (gnat_type)) + && Is_Array_Type (gnat_und_type) && !TREE_CONSTANT (gnu_object_size)) gnu_size = size_binop (MAX_EXPR, gnu_object_size, bitsize_unit_node); @@ -1246,7 +1248,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) subtype, then it can overlay only another aliased object with an unconstrained array nominal subtype and compatible template. */ if (Is_Constr_Subt_For_UN_Aliased (gnat_type) - && Is_Array_Type (Underlying_Type (gnat_type)) + && Is_Array_Type (gnat_und_type) && !type_annotate_only) { tree rec_type = TREE_TYPE (gnu_type); @@ -1487,7 +1489,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) object. Note that we have to do it this late because of the couple of allocation adjustments that might be made above. */ if (Is_Constr_Subt_For_UN_Aliased (gnat_type) - && Is_Array_Type (Underlying_Type (gnat_type)) + && Is_Array_Type (gnat_und_type) && !type_annotate_only) { /* In case the object with the template has already been allocated |