FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Ada] Fix wrong code for initialization of fat pointer with -Og

Browse source 
2018-06-11  Eric Botcazou  <ebotcazou@adacore.com>

gcc/ada/

	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Array_Type>: Reuse the
	existing fields of a dummy fat pointer type, if any.  Clear the
	TYPE_DECL_SUPPRESS_DEBUG on the fat pointer type after completing it.

From-SVN: r261431
This commit is contained in:
Eric Botcazou 2018-06-11 09:19:51 +00:00 • committed by Pierre-Marie de Rodat
parent a8531f7134
commit 259cc9a7e0
2 changed files with 40 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/ada/ChangeLog
View file

@ -1,3 +1,9 @@
2018-06-11 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Array_Type>: Reuse the
existing fields of a dummy fat pointer type, if any. Clear the
TYPE_DECL_SUPPRESS_DEBUG on the fat pointer type after completing it.
2018-06-11 Hristian Kirtchev <kirtchev@adacore.com> 2018-06-11 Hristian Kirtchev <kirtchev@adacore.com>
* contracts.adb (Process_Body_Postconditions): Expand only checked * contracts.adb (Process_Body_Postconditions): Expand only checked

53
gcc/ada/gcc-interface/decl.c
View file

@ -2055,11 +2055,16 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
{ {
gnu_fat_type = TYPE_MAIN_VARIANT (TYPE_POINTER_TO (gnu_type)); gnu_fat_type = TYPE_MAIN_VARIANT (TYPE_POINTER_TO (gnu_type));
TYPE_NAME (gnu_fat_type) = NULL_TREE; TYPE_NAME (gnu_fat_type) = NULL_TREE;
gnu_ptr_template =
TREE_TYPE (DECL_CHAIN (TYPE_FIELDS (gnu_fat_type)));
gnu_template_type = TREE_TYPE (gnu_ptr_template);
/* Save the contents of the dummy type for update_pointer_to. */ /* Save the contents of the dummy type for update_pointer_to. */
TYPE_POINTER_TO (gnu_type) = copy_type (gnu_fat_type); TYPE_POINTER_TO (gnu_type) = copy_type (gnu_fat_type);
gnu_ptr_template = TYPE_FIELDS (TYPE_POINTER_TO (gnu_type))
TREE_TYPE (TREE_CHAIN (TYPE_FIELDS (gnu_fat_type))); = copy_node (TYPE_FIELDS (gnu_fat_type));
gnu_template_type = TREE_TYPE (gnu_ptr_template); DECL_CHAIN (TYPE_FIELDS (TYPE_POINTER_TO (gnu_type)))
= copy_node (DECL_CHAIN (TYPE_FIELDS (gnu_fat_type)));
} }
else else
{ {
@ -2080,29 +2085,39 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
/* Build the fat pointer type. Use a "void *" object instead of /* Build the fat pointer type. Use a "void *" object instead of
a pointer to the array type since we don't have the array type a pointer to the array type since we don't have the array type
yet (it will reference the fat pointer via the bounds). */ yet (it will reference the fat pointer via the bounds). Note
tem that we reuse the existing fields of a dummy type because for:
= create_field_decl (get_identifier ("P_ARRAY"), ptr_type_node,
gnu_fat_type, NULL_TREE, NULL_TREE, 0, 0);
DECL_CHAIN (tem)
= create_field_decl (get_identifier ("P_BOUNDS"), gnu_ptr_template,
gnu_fat_type, NULL_TREE, NULL_TREE, 0, 0);
type Arr is array (Positive range <>) of Element_Type;
type Array_Ref is access Arr;
Var : Array_Ref := Null;
in a declarative part, Arr will be frozen only after Var, which
means that the fields used in the CONSTRUCTOR built for Null are
those of the dummy type, which in turn means that COMPONENT_REFs
of Var may be built with these fields. Now if COMPONENT_REFs of
Var are also built later with the fields of the final type, the
aliasing machinery may consider that the accesses are distinct
if the FIELD_DECLs are distinct as objects. */
if (COMPLETE_TYPE_P (gnu_fat_type)) if (COMPLETE_TYPE_P (gnu_fat_type))
{ {
/* We are going to lay it out again so reset the alias set. */ tem = TYPE_FIELDS (gnu_fat_type);
alias_set_type alias_set = TYPE_ALIAS_SET (gnu_fat_type); TREE_TYPE (tem) = ptr_type_node;
TYPE_ALIAS_SET (gnu_fat_type) = -1; TREE_TYPE (DECL_CHAIN (tem)) = gnu_ptr_template;
finish_fat_pointer_type (gnu_fat_type, tem); TYPE_DECL_SUPPRESS_DEBUG (TYPE_STUB_DECL (gnu_fat_type)) = 0;
TYPE_ALIAS_SET (gnu_fat_type) = alias_set;
for (t = gnu_fat_type; t; t = TYPE_NEXT_VARIANT (t)) for (t = gnu_fat_type; t; t = TYPE_NEXT_VARIANT (t))
{ SET_TYPE_UNCONSTRAINED_ARRAY (t, gnu_type);
TYPE_FIELDS (t) = tem;
SET_TYPE_UNCONSTRAINED_ARRAY (t, gnu_type);
}
} }
else else
{ {
tem
= create_field_decl (get_identifier ("P_ARRAY"),
ptr_type_node, gnu_fat_type,
NULL_TREE, NULL_TREE, 0, 0);
DECL_CHAIN (tem)
= create_field_decl (get_identifier ("P_BOUNDS"),
gnu_ptr_template, gnu_fat_type,
NULL_TREE, NULL_TREE, 0, 0);
finish_fat_pointer_type (gnu_fat_type, tem); finish_fat_pointer_type (gnu_fat_type, tem);
SET_TYPE_UNCONSTRAINED_ARRAY (gnu_fat_type, gnu_type); SET_TYPE_UNCONSTRAINED_ARRAY (gnu_fat_type, gnu_type);
} }