OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Andreas Arnez 2019-10-15 14:20:14 +02:00
parent 9a73315161
commit ba18312d8f
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

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

21
gdb/s390-tdep.c
View File

@ -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;