diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2019-03-08 10:15:11 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2019-03-09 08:09:38 -0500 |
| commit | 595f96a94448d1327aeac8783622e390794a722c (patch) | |
| tree | d3984ad30828f5f2a623fbda0831f5a4e6a564d3 | |
| parent | 2598a94b1e23c148a8f84d796e92de3a10d6e4e5 (diff) | |
| download | gdb-595f96a94448d1327aeac8783622e390794a722c.zip gdb-595f96a94448d1327aeac8783622e390794a722c.tar.gz gdb-595f96a94448d1327aeac8783622e390794a722c.tar.bz2 | |
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.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbtypes.c | 33 |
2 files changed, 27 insertions, 12 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ad9291..765d368 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 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 from... (rank_one_type): ... this. diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 8140aa5..0078a04 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -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)) { |