aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@efficios.com>2019-03-08 10:15:08 -0500
committerSimon Marchi <simon.marchi@efficios.com>2019-03-09 08:09:38 -0500
commitf1f832d6cd39e14e9f8c0ba142d2e442792119e4 (patch)
tree9ec1e7ac72e91d773725be6a77e2f8233e28658d
parentb9f4512f250f7fa685f1f888b6fcbe2e34dc9733 (diff)
downloadgdb-f1f832d6cd39e14e9f8c0ba142d2e442792119e4.zip
gdb-f1f832d6cd39e14e9f8c0ba142d2e442792119e4.tar.gz
gdb-f1f832d6cd39e14e9f8c0ba142d2e442792119e4.tar.bz2
Split rank_one_type_parm_func from rank_one_type
gdb/ChangeLog: * gdbtypes.c (rank_one_type_parm_func): New function extracted from... (rank_one_type): ... this.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/gdbtypes.c22
2 files changed, 21 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c3d381a..78be7d3 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_func): New function extracted
+ from...
+ (rank_one_type): ... this.
+
+2019-03-08 Simon Marchi <simon.marchi@efficios.com>
+
* gdbtypes.c (rank_one_type_parm_array): New function extracted
from...
(rank_one_type): ... this.
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index a9a1238..9cf18a6 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -3873,6 +3873,20 @@ rank_one_type_parm_array (struct type *parm, struct type *arg, struct value *val
}
}
+/* rank_one_type helper for when PARM's type code is TYPE_CODE_FUNC. */
+
+static struct rank
+rank_one_type_parm_func (struct type *parm, struct type *arg, struct value *value)
+{
+ switch (TYPE_CODE (arg))
+ {
+ case TYPE_CODE_PTR: /* funcptr -> func */
+ return rank_one_type (parm, TYPE_TARGET_TYPE (arg), 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
@@ -3967,13 +3981,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value)
case TYPE_CODE_ARRAY:
return rank_one_type_parm_array (parm, arg, value);
case TYPE_CODE_FUNC:
- switch (TYPE_CODE (arg))
- {
- case TYPE_CODE_PTR: /* funcptr -> func */
- return rank_one_type (parm, TYPE_TARGET_TYPE (arg), NULL);
- default:
- return INCOMPATIBLE_TYPE_BADNESS;
- }
+ return rank_one_type_parm_func (parm, arg, value);
case TYPE_CODE_INT:
switch (TYPE_CODE (arg))
{