diff options
| -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; |