OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

decl.c (purpose_member_field): New static function. 

* gcc-interface/decl.c (purpose_member_field): New static function.
	(annotate_rep): Use it instead of purpose_member.

From-SVN: r153616
This commit is contained in:
Eric Botcazou 2009-10-27 20:24:31 +00:00 committed by Eric Botcazou
parent b7da9fd42d
commit 73d2803438
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ada/ChangeLog
View File

@ -1,3 +1,8 @@
2009-10-27 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/decl.c (purpose_member_field): New static function.
(annotate_rep): Use it instead of purpose_member.
2009-10-27 Eric Botcazou <ebotcazou@adacore.com>
* raise-gcc (db_region_for): Use _Unwind_GetIPInfo instead of

24
gcc/ada/gcc-interface/decl.c
View File

@ -7231,6 +7231,23 @@ annotate_object (Entity_Id gnat_entity, tree gnu_type, tree size, bool by_ref)
UI_From_Int (TYPE_ALIGN (gnu_type) / BITS_PER_UNIT));
}
/* Return first element of field list whose TREE_PURPOSE is ELEM or whose
DECL_ORIGINAL_FIELD of TREE_PURPOSE is ELEM. Return NULL_TREE if there
is no such element in the list. */
static tree
purpose_member_field (const_tree elem, tree list)
{
while (list)
{
tree field = TREE_PURPOSE (list);
if (elem == field || elem == DECL_ORIGINAL_FIELD (field))
return list;
list = TREE_CHAIN (list);
}
return NULL_TREE;
}
/* Given GNAT_ENTITY, a record type, and GNU_TYPE, its corresponding GCC type,
set Component_Bit_Offset and Esize of the components to the position and
size used by Gigi. */
@ -7254,11 +7271,12 @@ annotate_rep (Entity_Id gnat_entity, tree gnu_type)
|| (Ekind (gnat_field) == E_Discriminant
&& !Is_Unchecked_Union (Scope (gnat_field))))
{
tree parent_offset, t;
t = purpose_member (gnat_to_gnu_field_decl (gnat_field), gnu_list);
tree t = purpose_member_field (gnat_to_gnu_field_decl (gnat_field),
gnu_list);
if (t)
{
tree parent_offset;
if (type_annotate_only && Is_Tagged_Type (gnat_entity))
{
/* In this mode the tag and parent components are not