diff options
author | Marek Polacek <polacek@redhat.com> | 2020-03-05 14:07:25 -0500 |
---|---|---|
committer | Marek Polacek <polacek@redhat.com> | 2020-03-09 09:24:55 -0400 |
commit | 8475f2902a2e2ca5f7ace8bc5265bd1a815dda20 (patch) | |
tree | 616f67587661f17ab966cc152b5fd8cd25917fb0 /gcc/testsuite/g++.dg/abi | |
parent | 157e23d8803dda38d7d38404bcc4284ce2dce3b5 (diff) | |
download | gcc-8475f2902a2e2ca5f7ace8bc5265bd1a815dda20.zip gcc-8475f2902a2e2ca5f7ace8bc5265bd1a815dda20.tar.gz gcc-8475f2902a2e2ca5f7ace8bc5265bd1a815dda20.tar.bz2 |
c++: Fix ABI issue with alignas on armv7hl [PR94050]
The static_assert in the following test was failing on armv7hl because
we were disregarding the alignas specifier on Cell. BaseShape's data
takes up 20B on 32-bit architectures, but we failed to round up its
TYPE_SIZE. This happens since the
<https://gcc.gnu.org/ml/gcc-patches/2019-06/msg01189.html>
patch: here, in layout_class_type for TenuredCell, we see that the size
of TenuredCell and its CLASSTYPE_AS_BASE match, so we set
CLASSTYPE_AS_BASE (t) = t;
While TYPE_USER_ALIGN of TenuredCell was 0, because finalize_type_size
called from finish_record_layout reset it, TYPE_USER_ALIGN of its
CLASSTYPE_AS_BASE still remained 1. After we replace it, it's no longer
1. Then we perform layout_empty_base_or_field for TenuredCell and since
TYPE_USER_ALIGN of its CLASSTYPE_AS_BASE is now 0, we don't do this
adjustment:
if (CLASSTYPE_USER_ALIGN (type))
{
rli->record_align = MAX (rli->record_align, CLASSTYPE_ALIGN (type));
if (warn_packed)
rli->unpacked_align = MAX (rli->unpacked_align, CLASSTYPE_ALIGN (type));
TYPE_USER_ALIGN (rli->t) = 1;
}
where rli->t is BaseShape. Then finalize_record_size won't use the
correct rli->record_align and therefore
/* Round the size up to be a multiple of the required alignment. */
TYPE_SIZE (rli->t) = round_up (unpadded_size, TYPE_ALIGN (rli->t));
after this we end up with the wrong size.
Since the original fix was to avoid creating extra copies for LTO
purposes, I think the following fix should be acceptable.
PR c++/94050 - ABI issue with alignas on armv7hl.
* class.c (layout_class_type): Don't replace a class's
CLASSTYPE_AS_BASE if their TYPE_USER_ALIGN don't match.
* g++.dg/abi/align3.C: New test.
Diffstat (limited to 'gcc/testsuite/g++.dg/abi')
-rw-r--r-- | gcc/testsuite/g++.dg/abi/align3.C | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gcc/testsuite/g++.dg/abi/align3.C b/gcc/testsuite/g++.dg/abi/align3.C new file mode 100644 index 0000000..a56693a --- /dev/null +++ b/gcc/testsuite/g++.dg/abi/align3.C @@ -0,0 +1,12 @@ +// PR c++/94050 - ABI issue with alignas on armv7hl. +// { dg-do compile { target c++11 } } + +struct alignas(8) Cell {}; +struct TenuredCell : public Cell {}; +struct BaseShape : public TenuredCell { + void *p; + unsigned q, r; + void *s; + __UINTPTR_TYPE__ t; +}; +static_assert (sizeof (BaseShape) % 8 == 0, ""); |