diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 07dacc0a3b..a5881bfbfc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-23  Doug Evans  <xdje42@gmail.com>
+
+	* gdbtypes.c (print_args): Renamed from print_arg_types.  Print arg
+	number and name if present.  All callers updated.
+	(dump_fn_fieldlists): Fix indentation of args.
+
 2014-11-23  Patrick Palka  <patrick@parcs.ath.cx>
 
 	* MAINTAINERS (Write After Approval): Add myself.
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index b921c64f31..976d56f614 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -3509,14 +3509,18 @@ print_bit_vector (B_TYPE *bits, int nbits)
    situation.  */
 
 static void
-print_arg_types (struct field *args, int nargs, int spaces)
+print_args (struct field *args, int nargs, int spaces)
 {
   if (args != NULL)
     {
       int i;
 
       for (i = 0; i < nargs; i++)
-	recursive_dump_type (args[i].type, spaces + 2);
+	{
+	  printfi_filtered (spaces, "[%d] name '%s'\n", i,
+			    args[i].name != NULL ? args[i].name : "<NULL>");
+	  recursive_dump_type (args[i].type, spaces + 2);
+	}
     }
 }
 
@@ -3574,11 +3578,9 @@ dump_fn_fieldlists (struct type *type, int spaces)
 	  gdb_print_host_address (TYPE_FN_FIELD_ARGS (f, overload_idx), 
 				  gdb_stdout);
 	  printf_filtered ("\n");
-
-	  print_arg_types (TYPE_FN_FIELD_ARGS (f, overload_idx),
-			   TYPE_NFIELDS (TYPE_FN_FIELD_TYPE (f, 
-							     overload_idx)),
-			   spaces);
+	  print_args (TYPE_FN_FIELD_ARGS (f, overload_idx),
+		      TYPE_NFIELDS (TYPE_FN_FIELD_TYPE (f, overload_idx)),
+		      spaces + 8 + 2);
 	  printfi_filtered (spaces + 8, "fcontext ");
 	  gdb_print_host_address (TYPE_FN_FIELD_FCONTEXT (f, overload_idx),
 				  gdb_stdout);