diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2c2b237..e105d51 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,11 @@ 2015-06-01 Eric Botcazou <ebotcazou@adacore.com> + * gcc-interface/decl.c (gnat_to_gnu_entity) <E_Record_Type>: If the + record has a parent field and a representation clause, make sure that + it is properly aligned. + +2015-06-01 Eric Botcazou <ebotcazou@adacore.com> + * gcc-interface/trans.c (lvalue_required_p) <N_Indexed_Component>: Deal with character and enumeration literals as index values. diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 966bf8e..21f5f70 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -3019,6 +3019,12 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) else gnu_parent = gnat_to_gnu_type (gnat_parent); + /* The parent field needs strict alignment so, if it is to + be created with a component clause below, then we need + to apply the same adjustment as in gnat_to_gnu_field. */ + if (has_rep && TYPE_ALIGN (gnu_type) < TYPE_ALIGN (gnu_parent)) + TYPE_ALIGN (gnu_type) = TYPE_ALIGN (gnu_parent); + /* Finally we fix up both kinds of twisted COMPONENT_REF we have initially built. The discriminants must reference the fields of the parent subtype and not those of its base type for the |