[11/13] Split rank_one_type_parm_struct from rank_one_type

Message ID 20190227200028.27360-12-simon.marchi@efficios.com
State New
Headers show
Series
  • Splut rank_one_type in smaller functions
Related show

Commit Message

Simon Marchi Feb. 27, 2019, 8 p.m.
gdb/ChangeLog:

	* gdbtypes.c (rank_one_type_parm_struct): New function extracted
	from...
	(rank_one_type): ... this.
---
 gdb/gdbtypes.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

-- 
2.21.0

Patch

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 3cf6ba87f7..ef6b17651a 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -4162,6 +4162,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
@@ -4272,18 +4292,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))
 	{