From a59240a41ac34d91e4ef5dd8b484763639388364 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 16 Apr 2019 11:11:10 -0600 Subject: Fix passing of struct with bitfields on x86-64 Commit 4aa866af ("Fix AMD64 return value ABI in expression evaluation") introduced a regression when calling a function with a structure that contains bitfields. Because the caller of amd64_has_unaligned_fields handles bitfields already, it seemed to me that the simplest fix was to ignore bitfields here. gdb/ChangeLog 2019-04-24 Tom Tromey * amd64-tdep.c (amd64_has_unaligned_fields): Ignore bitfields. gdb/testsuite/ChangeLog 2019-04-24 Tom Tromey * gdb.arch/amd64-eval.exp: Test bitfield return. * gdb.arch/amd64-eval.cc (struct Bitfields): New. (class Foo) : New method. (main): Call it. --- gdb/amd64-tdep.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gdb/amd64-tdep.c') diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c index d4c96de..31791f9 100644 --- a/gdb/amd64-tdep.c +++ b/gdb/amd64-tdep.c @@ -555,11 +555,13 @@ amd64_has_unaligned_fields (struct type *type) int bitpos = TYPE_FIELD_BITPOS (type, i); int align = type_align(subtype); - /* Ignore static fields, or empty fields, for example nested - empty structures. */ + /* Ignore static fields, empty fields (for example nested + empty structures), and bitfields (these are handled by + the caller). */ if (field_is_static (&TYPE_FIELD (type, i)) || (TYPE_FIELD_BITSIZE (type, i) == 0 - && TYPE_LENGTH (subtype) == 0)) + && TYPE_LENGTH (subtype) == 0) + || TYPE_FIELD_PACKED (type, i)) continue; if (bitpos % 8 != 0) @@ -569,7 +571,7 @@ amd64_has_unaligned_fields (struct type *type) if (bytepos % align != 0) return true; - if (amd64_has_unaligned_fields(subtype)) + if (amd64_has_unaligned_fields (subtype)) return true; } } -- cgit v1.1