aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2017-05-27 11:30:22 +0000
committerIain Buclaw <ibuclaw@gcc.gnu.org>2017-05-27 11:30:22 +0000
commitdc64856fdf1205f21865ab523cbb1a0bea4e8f20 (patch)
tree681bfc589fd1a0925819c7675b5096ec77464dc1
parent0e3712f6aa8dcd27433ac8090a0d1c48976003ae (diff)
downloadgcc-dc64856fdf1205f21865ab523cbb1a0bea4e8f20.zip
gcc-dc64856fdf1205f21865ab523cbb1a0bea4e8f20.tar.gz
gcc-dc64856fdf1205f21865ab523cbb1a0bea4e8f20.tar.bz2
d-demangle.c (dlang_identifier): Prefix mangled init symbols with `initializer for'.
libiberty/ChangeLog: * d-demangle.c (dlang_identifier): Prefix mangled init symbols with `initializer for'. * testsuite/demangle-expected: Update tests. From-SVN: r248539
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/d-demangle.c3
-rw-r--r--libiberty/testsuite/d-demangle-expected2
3 files changed, 9 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ba16ee5..45bec99 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,5 +1,11 @@
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
before dlang_type.
(dlang_type): Handle function types.
diff --git a/libiberty/d-demangle.c b/libiberty/d-demangle.c
index 829050b..08690de 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 7bf8b17..547a2dd 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