From 7f93105c7578e0295e89d883868e2c27bad1ae73 Mon Sep 17 00:00:00 2001 From: ibuclaw Date: Sat, 27 May 2017 11:30:22 +0000 Subject: [PATCH] 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 --- libiberty/ChangeLog | 6 ++++++ libiberty/d-demangle.c | 3 ++- libiberty/testsuite/d-demangle-expected | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index ba16ee5f295..45bec9963d7 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,5 +1,11 @@ 2017-05-27 Iain Buclaw + * d-demangle.c (dlang_identifier): Prefix mangled init symbols + with `initializer for'. + * testsuite/demangle-expected: Update tests. + +2017-05-27 Iain Buclaw + * d-demangle.c (dlang_call_convention_p): Move declaration before dlang_type. (dlang_type): Handle function types. diff --git a/libiberty/d-demangle.c b/libiberty/d-demangle.c index 829050bc0b8..08690de9bd3 100644 --- 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 index 7bf8b1725f9..547a2ddec39 100644 --- 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 -- 2.11.4.GIT