diff options
| author | DJ Delorie <dj@redhat.com> | 2012-03-08 00:01:31 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2012-03-08 00:01:31 +0000 |
| commit | 4e3aa408903f6f4ed9177fff7def91fe6bb8fd2b (patch) | |
| tree | ead2bec52218e30195d61099b7b2a9a5c05808e8 /libiberty/cp-demangle.c | |
| parent | af112affbd247c60075de6cc6f755df8d6ff655d (diff) | |
| download | ppe42-binutils-4e3aa408903f6f4ed9177fff7def91fe6bb8fd2b.tar.gz ppe42-binutils-4e3aa408903f6f4ed9177fff7def91fe6bb8fd2b.zip | |
merge from gcc
Diffstat (limited to 'libiberty/cp-demangle.c')
| -rw-r--r-- | libiberty/cp-demangle.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 18b84a126e..2b3d1820c6 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -1419,7 +1419,12 @@ d_unqualified_name (struct d_info *di) ret = d_operator_name (di); if (ret != NULL && ret->type == DEMANGLE_COMPONENT_OPERATOR) - di->expansion += sizeof "operator" + ret->u.s_operator.op->len - 2; + { + di->expansion += sizeof "operator" + ret->u.s_operator.op->len - 2; + if (!strcmp (ret->u.s_operator.op->code, "li")) + ret = d_make_comp (di, DEMANGLE_COMPONENT_UNARY, ret, + d_source_name (di)); + } return ret; } else if (peek == 'C' || peek == 'D') @@ -1596,6 +1601,7 @@ const struct demangle_operator_info cplus_demangle_operators[] = { "ix", NL ("[]"), 2 }, { "lS", NL ("<<="), 2 }, { "le", NL ("<="), 2 }, + { "li", NL ("operator\"\" "), 1 }, { "ls", NL ("<<"), 2 }, { "lt", NL ("<"), 2 }, { "mI", NL ("-="), 2 }, |
