d-demangle.c (dlang_function_args): Append ',' for variadic functions only if paramet...

libiberty/ChangeLog:

2016-01-26  Iain Buclaw  <ibuclaw@gdcproject.org>

	* d-demangle.c (dlang_function_args): Append ',' for variadic functions
	only if parameters were seen before the elipsis symbol.
	* testsuite/d-demangle-expected: Add coverage test for parameter-less
	variadic functions.

From-SVN: r232863

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index aa1af40c50c3f56184b33683644a7eb781b901f4..88422c548156b0a6da2764a6240334ab5daa889e 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-27  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+       * d-demangle.c (dlang_function_args): Append ',' for variadic functions
+       only if parameters were seen before the elipsis symbol.
+       * testsuite/d-demangle-expected: Add coverage test for parameter-less
+       variadic functions.
+
 2016-01-27  Iain Buclaw  <ibuclaw@gdcproject.org>
 
        * d-demangle.c (dlang_type): Handle function types only in the context

diff --git a/libiberty/d-demangle.c b/libiberty/d-demangle.c
index 9c4d4597e8d9064928b058c8e01af86f21a66e14..9e5a80439f57cd00c6f36172b84c11f8f4c5eecc 100644 (file)
--- a/libiberty/d-demangle.c
+++ b/libiberty/d-demangle.c
@@ -399,7 +399,9 @@ dlang_function_args (string *decl, const char *mangled)
          return mangled;
        case 'Y': /* (variadic T t, ...) style.  */
          mangled++;
-         string_append (decl, ", ...");
+         if (n != 0)
+           string_append (decl, ", ");
+         string_append (decl, "...");
          return mangled;
        case 'Z': /* Normal function.  */
          mangled++;

diff --git a/libiberty/testsuite/d-demangle-expected b/libiberty/testsuite/d-demangle-expected
index 11785f2c572f21ebe8bfaee7140e7082dca1b178..8f0b167142c548cadfef0c5e48c78a8e90367f27 100644 (file)
--- a/libiberty/testsuite/d-demangle-expected
+++ b/libiberty/testsuite/d-demangle-expected
@@ -342,6 +342,10 @@ _D8demangle4testFaaYv
 demangle.test(char, char, ...)
 #
 --format=dlang
+_D8demangle4testFYv
+demangle.test(...)
+#
+--format=dlang
 _D8demangle4testFaaZv
 demangle.test(char, char)
 #