libiberty/ChangeLog:

* d-demangle.c (dlang_identifier): Prefix mangled init symbols with `initializer for'. * testsuite/demangle-expected: Update tests. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248539 138bc75d-0d04-0410-961f-82ee72b054a4
githjh · May 27, 2017 · 7f93105 · 7f93105
1 parent a4e2319
commit 7f93105
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-27  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* d-demangle.c (dlang_identifier): Prefix mangled init symbols
+	with `initializer for'.
+	* testsuite/demangle-expected: Update tests.
+
 2017-05-27  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	* d-demangle.c (dlang_call_convention_p): Move declaration

diff --git a/libiberty/d-demangle.c b/libiberty/d-demangle.c
@@ -864,7 +864,8 @@ dlang_identifier (string *decl, const char *mangled,
 	  else if (strncmp (mangled, "__initZ", len+1) == 0)
 	    {
 	      /* The static initialiser for a given symbol.  */
-	      string_append (decl, "init$");
+	      string_prepend (decl, "initializer for ");
+	      string_setlength (decl, string_length (decl) - 1);
 	      mangled += len;
 	      return mangled;
 	    }

diff --git a/libiberty/testsuite/d-demangle-expected b/libiberty/testsuite/d-demangle-expected
@@ -587,7 +587,7 @@ demangle.test(scope char() scope function)
 #
 --format=dlang
 _D8demangle4test6__initZ
-demangle.test.init$
+initializer for demangle.test
 #
 --format=dlang
 _D8demangle4test6__vtblZ