aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/gdbtypes.c26
2 files changed, 23 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4afd9b6..c3d381a 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_array): New function extracted
+ from...
+ (rank_one_type): ... this.
+
+2019-03-08 Simon Marchi <simon.marchi@efficios.com>
+
* gdbtypes.c (rank_one_type_parm_ptr): New function extracted
from...
(rank_one_type): ... this.
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index b4b9273..a9a1238 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -3857,6 +3857,22 @@ rank_one_type_parm_ptr (struct type *parm, struct type *arg, struct value *value
}
}
+/* rank_one_type helper for when PARM's type code is TYPE_CODE_ARRAY. */
+
+static struct rank
+rank_one_type_parm_array (struct type *parm, struct type *arg, struct value *value)
+{
+ switch (TYPE_CODE (arg))
+ {
+ case TYPE_CODE_PTR:
+ case TYPE_CODE_ARRAY:
+ return rank_one_type (TYPE_TARGET_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
@@ -3949,15 +3965,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value)
case TYPE_CODE_PTR:
return rank_one_type_parm_ptr (parm, arg, value);
case TYPE_CODE_ARRAY:
- switch (TYPE_CODE (arg))
- {
- case TYPE_CODE_PTR:
- case TYPE_CODE_ARRAY:
- return rank_one_type (TYPE_TARGET_TYPE (parm),
- TYPE_TARGET_TYPE (arg), NULL);
- default:
- return INCOMPATIBLE_TYPE_BADNESS;
- }
+ return rank_one_type_parm_array (parm, arg, value);
case TYPE_CODE_FUNC:
switch (TYPE_CODE (arg))
{