From f09ce22d6a2266c3bbe5061eb61e7fad65568652 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_set from rank_one_type gdb/ChangeLog: * gdbtypes.c (rank_one_type_parm_set): 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 765d3686b63..b96a40dedb5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-03-08 Simon Marchi + + * gdbtypes.c (rank_one_type_parm_set): New function extracted + from... + (rank_one_type): ... this. + 2019-03-08 Simon Marchi * gdbtypes.c (rank_one_type_parm_struct): New function extracted diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 0078a044176..729d84962a3 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4157,6 +4157,22 @@ rank_one_type_parm_struct (struct type *parm, struct type *arg, struct value *va } } +/* rank_one_type helper for when PARM's type code is TYPE_CODE_SET. */ + +static struct rank +rank_one_type_parm_set (struct type *parm, struct type *arg, struct value *value) +{ + switch (TYPE_CODE (arg)) + { + /* Not in C++ */ + case TYPE_CODE_SET: + return rank_one_type (TYPE_FIELD_TYPE (parm, 0), + TYPE_FIELD_TYPE (arg, 0), NULL); + 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 @@ -4301,16 +4317,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) break; case TYPE_CODE_SET: - switch (TYPE_CODE (arg)) - { - /* Not in C++ */ - case TYPE_CODE_SET: - return rank_one_type (TYPE_FIELD_TYPE (parm, 0), - TYPE_FIELD_TYPE (arg, 0), NULL); - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; + return rank_one_type_parm_set (parm, arg, value); case TYPE_CODE_VOID: default: return INCOMPATIBLE_TYPE_BADNESS; -- 2.30.2