diff options
| author | DJ Delorie <dj@delorie.com> | 2012-03-08 00:01:18 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2012-03-08 00:01:18 +0000 |
| commit | 0abc4898f61eb02eac736d48fb8fb9d92c610067 (patch) | |
| tree | f7f030becb810aa4adf19b12e1fc99e912b830df /libiberty | |
| parent | 13cd52cfd198a089b406c1c2eeef7b4556792d51 (diff) | |
| download | gdb-0abc4898f61eb02eac736d48fb8fb9d92c610067.tar.gz | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 8 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 5f492cc3978..97bdfed4cc6 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2012-03-07 Jason Merrill <jason@redhat.com> + + * cp-demangle.c (cplus_demangle_operators): Add li. + (d_unqualified_name): Handle it specially. + 2012-01-26 Jakub Jelinek <jakub@redhat.com> * make-relative-prefix.c (make_relative_prefix_1): Avoid warning diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 18b84a126e8..2b3d1820c60 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 }, diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 408c4f47794..036c4813513 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -4072,6 +4072,9 @@ decltype (g({parm#1}, {})) f1<int>(int) --format=gnu-v3 _Z2f1IiEDTnw_T_ilEES0_ decltype (new int{}) f1<int>(int) +--format=gnu-v3 +_Zli2_wPKc +operator"" _w(char const*) # # Ada (GNAT) tests. # |