From 4ce0b7f41352e23b7028aedd24d6757b472e44cf Mon Sep 17 00:00:00 2001
From: mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 23 Dec 2002 02:10:18 +0000
Subject: [PATCH] * stor-layout.c (update_alignment_for_field): Use
ADJUST_FIELD_ALIGN when computing the alignment for a zero-width
bitfield when PCC_BITFIELD_TYPE_MATTERS.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60419 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 6 ++++++
gcc/stor-layout.c | 5 ++++-
gcc/testsuite/gcc.dg/i386-bitfield2.c | 22 ++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gcc.dg/i386-bitfield2.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 505257ae3f59..dca029bd1e5d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-22 Mark Mitchell <mark@codesourcery.com>
+
+ * stor-layout.c (update_alignment_for_field): Use
+ ADJUST_FIELD_ALIGN when computing the alignment for a zero-width
+ bitfield when PCC_BITFIELD_TYPE_MATTERS.
+
2002-12-22 Kazu Hirata <kazu@cs.umass.edu>
* genautomata.c: Fix comment typos.
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 0dd8fc61f1d4..21791fccf0d4 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -722,7 +722,10 @@ update_alignment_for_field (rli, field, known_align)
if (! integer_zerop (DECL_SIZE (field)))
rli->record_align = MAX (rli->record_align, desired_align);
else if (! DECL_PACKED (field))
- desired_align = TYPE_ALIGN (type);
+ {
+ desired_align = TYPE_ALIGN (type);
+ desired_align = ADJUST_FIELD_ALIGN (field, desired_align);
+ }
/* A named bit field of declared type `int'
forces the entire structure to have `int' alignment. */
diff --git a/gcc/testsuite/gcc.dg/i386-bitfield2.c b/gcc/testsuite/gcc.dg/i386-bitfield2.c
new file mode 100644
index 000000000000..2ea798207dc4
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/i386-bitfield2.c
@@ -0,0 +1,22 @@
+// Test for bitfield alignment in structs on IA-32
+// { dg-do run { target i?86-*-* } }
+// { dg-options "-O2" }
+// { dg-options "-mno-align-double -mno-ms-bitfields" { target *-*-interix* } }
+
+extern void abort (void);
+extern void exit (int);
+
+struct X {
+ char a;
+ long long : 0;
+ char b;
+} x;
+
+int main () {
+ if (&x.b - &x.a != 4)
+ abort ();
+ if (sizeof (x) != 5)
+ abort ();
+
+ exit (0);
+}
--
GitLab