diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2023-04-14 20:14:07 +0200 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@adacore.com> | 2023-04-14 20:17:55 +0200 |
| commit | 94a21e008c4778e446321b1355f61abc75a076be (patch) | |
| tree | f6a5e7c0b509f7414ebe35b904fa82db04a4c92d /gcc | |
| parent | 0d94c6df183375caaa7f672e288a2094ca813749 (diff) | |
| download | gcc-94a21e008c4778e446321b1355f61abc75a076be.zip gcc-94a21e008c4778e446321b1355f61abc75a076be.tar.gz gcc-94a21e008c4778e446321b1355f61abc75a076be.tar.bz2 | |
Fix build failure of Ada runtime for Aarch64 targets
The Aarch64 back-end now asserts that the main variant of scalar types
has TYPE_USER_ALIGN cleared, and that's not the case for scalar types
declared with a confirming alignment clause in Ada.
gcc/ada/
PR bootstrap/109510
* gcc-interface/decl.cc (gnat_to_gnu_entity) <types>: Reset align
to zero if its value is equal to TYPE_ALIGN and the type is scalar.
Set TYPE_USER_ALIGN on the type only if align is positive.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/gcc-interface/decl.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc index d24adf3..851a674 100644 --- a/gcc/ada/gcc-interface/decl.cc +++ b/gcc/ada/gcc-interface/decl.cc @@ -4364,13 +4364,17 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) /* If the alignment has not already been processed and this is not an unconstrained array type, see if an alignment is specified. If not, we pick a default alignment for atomic objects. */ - if (align != 0 || TREE_CODE (gnu_type) == UNCONSTRAINED_ARRAY_TYPE) + if (align > 0 || TREE_CODE (gnu_type) == UNCONSTRAINED_ARRAY_TYPE) ; else if (Known_Alignment (gnat_entity)) { align = validate_alignment (Alignment (gnat_entity), gnat_entity, TYPE_ALIGN (gnu_type)); + /* Treat confirming clauses on scalar types like the default. */ + if (align == TYPE_ALIGN (gnu_type) && !AGGREGATE_TYPE_P (gnu_type)) + align = 0; + /* Warn on suspiciously large alignments. This should catch errors about the (alignment,byte)/(size,bit) discrepancy. */ if (align > BIGGEST_ALIGNMENT && Has_Alignment_Clause (gnat_entity)) @@ -4666,7 +4670,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) TYPE_BY_REFERENCE_P (gnu_type) = 1; /* Record whether an alignment clause was specified. */ - if (Present (Alignment_Clause (gnat_entity))) + if (align > 0 && Present (Alignment_Clause (gnat_entity))) TYPE_USER_ALIGN (gnu_type) = 1; /* Record whether a pragma Universal_Aliasing was specified. */ |