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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4ad92916e15fa972e084a223f70d68b68e76a817..765d3686b638ef79eda56002114746468f5bcef1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 8140aa505abfb3cd3daec58b75c0c1776dd9af99..0078a044176f18814583d95b176480cadbe37694 100644 (file)
--- 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))
        {