Rename to allow_rust_tests

[binutils-gdb.git] / gdb / c-typeprint.c

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 3a611cdac5d1423abcc021af2b72d11c3e8a3938..dca962311176fc04cbd0b11554d770495f4e442e 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -1,5 +1,5 @@
 /* Support for printing C and C++ types for GDB, the GNU debugger.
-   Copyright (C) 1986-2022 Free Software Foundation, Inc.
+   Copyright (C) 1986-2023 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -273,35 +273,44 @@ cp_type_print_method_args (struct type *mtype, const char *prefix,
                  language_cplus, DMGL_ANSI);
   gdb_puts ("(", stream);
 
-  /* Skip the class variable.  We keep this here to accommodate older
-     compilers and debug formats which may not support artificial
-     parameters.  */
-  i = staticp ? 0 : 1;
-  if (nargs > i)
+  int printed_args = 0;
+  for (i = 0; i < nargs; ++i)
     {
-      while (i < nargs)
+      if (i == 0 && !staticp)
        {
-         struct field arg = args[i++];
-
-         /* Skip any artificial arguments.  */
-         if (FIELD_ARTIFICIAL (arg))
-           continue;
+         /* Skip the class variable.  We keep this here to accommodate older
+            compilers and debug formats which may not support artificial
+            parameters.  */
+         continue;
+       }
 
-         c_print_type (arg.type (), "", stream, 0, 0, language, flags);
+      struct field arg = args[i];
+      /* Skip any artificial arguments.  */
+      if (FIELD_ARTIFICIAL (arg))
+       continue;
 
-         if (i == nargs && varargs)
-           gdb_printf (stream, ", ...");
-         else if (i < nargs)
-           {
-             gdb_printf (stream, ", ");
-             stream->wrap_here (8);
-           }
+      if (printed_args > 0)
+       {
+         gdb_printf (stream, ", ");
+         stream->wrap_here (8);
        }
+
+      c_print_type (arg.type (), "", stream, 0, 0, language, flags);
+      printed_args++;
+    }
+
+  if (varargs)
+    {
+      if (printed_args == 0)
+       gdb_printf (stream, "...");
+      else
+       gdb_printf (stream, ", ...");
+    }
+  else if (printed_args == 0)
+    {
+      if (language == language_cplus)
+       gdb_printf (stream, "void");
     }
-  else if (varargs)
-    gdb_printf (stream, "...");
-  else if (language == language_cplus)
-    gdb_printf (stream, "void");
 
   gdb_printf (stream, ")");