Split rank_one_type_parm_struct from rank_one_type

gdb/ChangeLog:

	* gdbtypes.c (rank_one_type_parm_struct): New function extracted
	from...
	(rank_one_type): ... this.
This commit is contained in:
Simon Marchi 2019-03-08 10:15:11 -05:00
parent 2598a94b1e
commit 595f96a944
2 changed files with 27 additions and 12 deletions

View File

@ -1,3 +1,9 @@
2019-03-08 Simon Marchi <simon.marchi@efficios.com>
* gdbtypes.c (rank_one_type_parm_struct): New function extracted
from...
(rank_one_type): ... this.
2019-03-08 Simon Marchi <simon.marchi@efficios.com>
* gdbtypes.c (rank_one_type_parm_complex): New function extracted

View File

@ -4137,6 +4137,26 @@ rank_one_type_parm_complex (struct type *parm, struct type *arg, struct value *v
}
}
/* rank_one_type helper for when PARM's type code is TYPE_CODE_STRUCT. */
static struct rank
rank_one_type_parm_struct (struct type *parm, struct type *arg, struct value *value)
{
struct rank rank = {0, 0};
switch (TYPE_CODE (arg))
{
case TYPE_CODE_STRUCT:
/* Check for derivation */
rank.subrank = distance_to_ancestor (parm, arg, 0);
if (rank.subrank >= 0)
return sum_ranks (BASE_CONVERSION_BADNESS, rank);
/* fall through */
default:
return INCOMPATIBLE_TYPE_BADNESS;
}
}
/* Compare one type (PARM) for compatibility with another (ARG).
* PARM is intended to be the parameter type of a function; and
* ARG is the supplied argument's type. This function tests if
@ -4247,18 +4267,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value)
case TYPE_CODE_COMPLEX:
return rank_one_type_parm_complex (parm, arg, value);
case TYPE_CODE_STRUCT:
switch (TYPE_CODE (arg))
{
case TYPE_CODE_STRUCT:
/* Check for derivation */
rank.subrank = distance_to_ancestor (parm, arg, 0);
if (rank.subrank >= 0)
return sum_ranks (BASE_CONVERSION_BADNESS, rank);
/* fall through */
default:
return INCOMPATIBLE_TYPE_BADNESS;
}
break;
return rank_one_type_parm_struct (parm, arg, value);
case TYPE_CODE_UNION:
switch (TYPE_CODE (arg))
{