diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-10-21 11:46:21 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2019-10-21 11:46:21 +0000 |
| commit | bff3f602b24a5caf1e0bbc1e05ff13f9127d4447 (patch) | |
| tree | b2a29849bd5a0436054dbfa09ebc1cc9e212a7fd | |
| parent | 350d44b3de8d8566bc3a72bfb138c11a820980d7 (diff) | |
Backported from mainline
2019-10-01 Jakub Jelinek <jakub@redhat.com>
PR c++/91925
* c-warn.c (check_alignment_of_packed_member): Ignore FIELD_DECLs
with NULL DECL_FIELD_OFFSET.
* g++.dg/conversion/packed2.C: New test.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@277255 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/c-family/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-family/c-warn.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/conversion/packed2.C | 15 |
4 files changed, 28 insertions, 0 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index baffbb13d6c..6e9ed0bb17e 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,6 +1,12 @@ 2019-10-21 Jakub Jelinek <jakub@redhat.com> Backported from mainline + 2019-10-01 Jakub Jelinek <jakub@redhat.com> + + PR c++/91925 + * c-warn.c (check_alignment_of_packed_member): Ignore FIELD_DECLs + with NULL DECL_FIELD_OFFSET. + 2019-09-27 Jakub Jelinek <jakub@redhat.com> PR c++/88203 diff --git a/gcc/c-family/c-warn.c b/gcc/c-family/c-warn.c index 322cf98eb02..67dce9e125a 100644 --- a/gcc/c-family/c-warn.c +++ b/gcc/c-family/c-warn.c @@ -2784,6 +2784,8 @@ check_alignment_of_packed_member (tree type, tree field, bool rvalue) /* Check alignment of the data member. */ if (TREE_CODE (field) == FIELD_DECL && (DECL_PACKED (field) || TYPE_PACKED (TREE_TYPE (field))) + /* Ignore FIELDs not laid out yet. */ + && DECL_FIELD_OFFSET (field) && (!rvalue || TREE_CODE (TREE_TYPE (field)) == ARRAY_TYPE)) { /* Check the expected alignment against the field alignment. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 494f0aded36..1af702a38f0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2019-10-21 Jakub Jelinek <jakub@redhat.com> Backported from mainline + 2019-10-01 Jakub Jelinek <jakub@redhat.com> + + PR c++/91925 + * g++.dg/conversion/packed2.C: New test. + 2019-09-27 Jakub Jelinek <jakub@redhat.com> PR c++/88203 diff --git a/gcc/testsuite/g++.dg/conversion/packed2.C b/gcc/testsuite/g++.dg/conversion/packed2.C new file mode 100644 index 00000000000..7df74dc110b --- /dev/null +++ b/gcc/testsuite/g++.dg/conversion/packed2.C @@ -0,0 +1,15 @@ +// PR c++/91925 +// { dg-do compile { target c++11 } } +// { dg-options "-fpack-struct" } + +struct A {}; +int foo (A); +struct B { + A a; + decltype (foo (a)) p; +}; +template <typename T> T bar (T); +class C { + A a; + decltype (bar (a)) p; +}; |