* gdbtypes.c (append_composite_type_field): Correct the location of

	appended fields.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e2eeb67823e4c71903dd4cdf4f1d9bcfa0eeb447..9ddb709cebe46b70b0b6f469b9c084eb01937096 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * gdbtypes.c (append_composite_type_field): Correct the location of
+       appended fields.
+
 2009-01-09  Pedro Alves  <pedro@codesourcery.com>
 
        * defs.h (deprecated_error_hook): Delete declaration.

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index c4e3646d1e9f3c5b64fb973c19db31ceb0111ad6..790442ca97a2da8314d0001442b43a80d6d9c295 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -1856,10 +1856,9 @@ append_composite_type_field (struct type *t, char *name,
     {
       TYPE_LENGTH (t) = TYPE_LENGTH (t) + TYPE_LENGTH (field);
       if (TYPE_NFIELDS (t) > 1)
-       {
-         FIELD_BITPOS (f[0]) = (FIELD_BITPOS (f[-1])
-                                + TYPE_LENGTH (field) * TARGET_CHAR_BIT);
-       }
+       FIELD_BITPOS (f[0]) = (FIELD_BITPOS (f[-1])
+                              + (TYPE_LENGTH (FIELD_TYPE (f[-1]))
+                                 * TARGET_CHAR_BIT));
     }
 }