diff options
| author | Jason Merrill <jason@redhat.com> | 2003-03-31 15:25:11 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2003-03-31 15:25:11 -0500 |
| commit | adff28c38d207dc3a6007b81380407de0b3def57 (patch) | |
| tree | 4a8375fa12eae842753474c9b26fb22fd446774f /gcc/stor-layout.c | |
| parent | e66833ac07efec1f12f35de6e3694238dd8ff96f (diff) | |
| download | gcc-adff28c38d207dc3a6007b81380407de0b3def57.zip gcc-adff28c38d207dc3a6007b81380407de0b3def57.tar.gz gcc-adff28c38d207dc3a6007b81380407de0b3def57.tar.bz2 | |
re PR java/10145 (java and c++ disagree about class layout)
PR java/10145
* stor-layout.c (update_alignment_for_field): Respect
DECL_USER_ALIGN for zero-length bitfields, too.
* c-decl.c (finish_struct): Don't set DECL_ALIGN for normal
fields.
* cp/class.c (check_field_decl): Don't set DECL_ALIGN.
From-SVN: r65103
Diffstat (limited to 'gcc/stor-layout.c')
| -rw-r--r-- | gcc/stor-layout.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index 6caaf5f..af02cad 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -746,7 +746,8 @@ update_alignment_for_field (rli, field, known_align) { /* A zero-length bit-field affects the alignment of the next field. */ - if (!DECL_PACKED (field) && integer_zerop (DECL_SIZE (field))) + if (!DECL_PACKED (field) && !user_align + && integer_zerop (DECL_SIZE (field))) { desired_align = TYPE_ALIGN (type); #ifdef ADJUST_FIELD_ALIGN |