[12/13] Split rank_one_type_parm_set from rank_one_type

Message ID 20190227200028.27360-13-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_set): New function extracted
	from...
	(rank_one_type): ... this.
---
 gdb/gdbtypes.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

-- 
2.21.0

Patch

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index ef6b17651a..dc054b9272 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -4182,6 +4182,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
@@ -4326,16 +4342,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;