stor-layout.c (update_alignment_for_field): Use ADJUST_FIELD_ALIGN when computing...

	* 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.

From-SVN: r60419

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 505257ae3f593eb59a9c70650595616c5c673d06..dca029bd1e5d38edc74bd5c46fb4c3376385cfd9 100644 (file)
--- 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 0dd8fc61f1d484237a918ddef1c894a77523ff56..21791fccf0d4130d7d85333292cb23a27132683a 100644 (file)
--- 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 (file)
index 0000000..2ea7982
--- /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);
+}