From 2598a94b1e23c148a8f84d796e92de3a10d6e4e5 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 8 Mar 2019 10:15:11 -0500 Subject: [PATCH] Split rank_one_type_parm_complex from rank_one_type gdb/ChangeLog: * gdbtypes.c (rank_one_type_parm_complex): New function extracted from... (rank_one_type): ... this. --- gdb/ChangeLog | 6 ++++++ gdb/gdbtypes.c | 27 +++++++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7df74fc9738..4ad92916e15 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-03-08 Simon Marchi + + * gdbtypes.c (rank_one_type_parm_complex): New function extracted + from... + (rank_one_type): ... this. + 2019-03-08 Simon Marchi * gdbtypes.c (rank_one_type_parm_float): New function extracted diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index fba9abf7ced..8140aa505ab 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4121,6 +4121,22 @@ rank_one_type_parm_float (struct type *parm, struct type *arg, struct value *val } } +/* rank_one_type helper for when PARM's type code is TYPE_CODE_COMPLEX. */ + +static struct rank +rank_one_type_parm_complex (struct type *parm, struct type *arg, struct value *value) +{ + switch (TYPE_CODE (arg)) + { /* Strictly not needed for C++, but... */ + case TYPE_CODE_FLT: + return FLOAT_PROMOTION_BADNESS; + case TYPE_CODE_COMPLEX: + return EXACT_MATCH_BADNESS; + 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 @@ -4229,16 +4245,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) case TYPE_CODE_FLT: return rank_one_type_parm_float (parm, arg, value); case TYPE_CODE_COMPLEX: - switch (TYPE_CODE (arg)) - { /* Strictly not needed for C++, but... */ - case TYPE_CODE_FLT: - return FLOAT_PROMOTION_BADNESS; - case TYPE_CODE_COMPLEX: - return EXACT_MATCH_BADNESS; - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; + return rank_one_type_parm_complex (parm, arg, value); case TYPE_CODE_STRUCT: switch (TYPE_CODE (arg)) { -- 2.30.2