diff options
| author | Andreas Arnez <arnez@linux.ibm.com> | 2019-10-15 14:20:14 +0200 |
|---|---|---|
| committer | Andreas Arnez <arnez@linux.ibm.com> | 2019-10-15 14:20:14 +0200 |
| commit | ba18312d8f2cecf88b6edcbc277f433a62131e58 (patch) | |
| tree | f1083c75b6db6a816e3e9f05e6f608c8150e1de9 | |
| parent | 9a73315161bc07d958060847ae01996312e1b30f (diff) | |
| download | gdb-ba18312d8f2cecf88b6edcbc277f433a62131e58.zip gdb-ba18312d8f2cecf88b6edcbc277f433a62131e58.tar.gz gdb-ba18312d8f2cecf88b6edcbc277f433a62131e58.tar.bz2 | |
s390: Fix infcalls passing a single-field struct with static members
The infcall-nested-structs test case yields 36 FAILs on s390x because GCC
and GDB disagree on how to pass a C++ struct like this as an argument to a
function:
struct s { float x; static float y; };
For the purpose of argument passing, GCC ignores static fields, while GDB
does not. Thus GCC passes the argument in a floating-point register and
GDB passes it via memory.
Fix this by explicitly ignoring static fields when detecting single-field
structs.
gdb/ChangeLog:
* s390-tdep.c (s390_effective_inner_type): Ignore static fields
when unwrapping single-field structs.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/s390-tdep.c | 21 |
2 files changed, 23 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c6fff16..21d5233 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-10-15 Andreas Arnez <arnez@linux.ibm.com> + + * s390-tdep.c (s390_effective_inner_type): Ignore static fields + when unwrapping single-field structs. + 2019-10-14 Simon Marchi <simon.marchi@polymtl.ca> * dwarf2read.c: Remove includes. diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index e7f1215..6bd0528 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1637,11 +1637,26 @@ s390_address_class_name_to_type_flags (struct gdbarch *gdbarch, static struct type * s390_effective_inner_type (struct type *type, unsigned int min_size) { - while (TYPE_CODE (type) == TYPE_CODE_STRUCT - && TYPE_NFIELDS (type) == 1) + while (TYPE_CODE (type) == TYPE_CODE_STRUCT) { - struct type *inner = check_typedef (TYPE_FIELD_TYPE (type, 0)); + struct type *inner = NULL; + /* Find a non-static field, if any. Unless there's exactly one, + abort the unwrapping. */ + for (int i = 0; i < TYPE_NFIELDS (type); i++) + { + struct field f = TYPE_FIELD (type, i); + + if (field_is_static (&f)) + continue; + if (inner != NULL) + return type; + inner = FIELD_TYPE (f); + } + + if (inner == NULL) + break; + inner = check_typedef (inner); if (TYPE_LENGTH (inner) < min_size) break; type = inner; |