diff options
Diffstat (limited to 'gcc/ada/gcc-interface/decl.c')
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 20c5fb4..0c7321d 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -3139,8 +3139,18 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) = DECL_DISCRIMINANT_NUMBER (gnu_old_field); TREE_THIS_VOLATILE (gnu_field) = TREE_THIS_VOLATILE (gnu_old_field); - TREE_CHAIN (gnu_field) = gnu_field_list; - gnu_field_list = gnu_field; + + /* To match the layout crafted in components_to_record, if + this is the _Tag field, put it before any discriminants + instead of after them as for all other fields. */ + if (Chars (gnat_field) == Name_uTag) + gnu_field_list = chainon (gnu_field_list, gnu_field); + else + { + TREE_CHAIN (gnu_field) = gnu_field_list; + gnu_field_list = gnu_field; + } + save_gnu_tree (gnat_field, gnu_field, false); } @@ -6436,8 +6446,7 @@ components_to_record (tree gnu_record_type, Node_Id component_list, packed, definition); /* If this is the _Tag field, put it before any discriminants, - instead of after them as is the case for all other fields. - Ignore field of void type if only annotating. */ + instead of after them as is the case for all other fields. */ if (Chars (gnat_field) == Name_uTag) gnu_field_list = chainon (gnu_field_list, gnu_field); else |