diff options
| author | DJ Delorie <dj@redhat.com> | 2011-10-10 21:02:57 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2011-10-10 21:02:57 +0000 |
| commit | f9fb0b2d9f19b8c8a54584a3c98994127262b2c8 (patch) | |
| tree | 492268da6cb2c9d5a387131c0d21bfa7c8703479 | |
| parent | 623bd5b7fdbfaa96315e4cf5cc4f81501ac28e9e (diff) | |
| download | gdb-f9fb0b2d9f19b8c8a54584a3c98994127262b2c8.zip gdb-f9fb0b2d9f19b8c8a54584a3c98994127262b2c8.tar.gz gdb-f9fb0b2d9f19b8c8a54584a3c98994127262b2c8.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 7 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 24 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 5 |
3 files changed, 36 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 59460e4..6859afa 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,10 @@ +2011-10-10 Ian Lance Taylor <iant@google.com> + + PR c++/48665 + * cp-demangle.c (d_cv_qualifiers): If qualifiers are applied to a + function type, change them to apply to the "this" parameter. + * testsuite/demangle-expected: Add test case. + 2011-09-28 Doug Evans <dje@google.com> * timeval-utils.c: New file. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 32318e8..c7afef0 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -2294,8 +2294,10 @@ static struct demangle_component ** d_cv_qualifiers (struct d_info *di, struct demangle_component **pret, int member_fn) { + struct demangle_component **pstart; char peek; + pstart = pret; peek = d_peek_char (di); while (peek == 'r' || peek == 'V' || peek == 'K') { @@ -2332,6 +2334,28 @@ d_cv_qualifiers (struct d_info *di, peek = d_peek_char (di); } + if (!member_fn && peek == 'F') + { + while (pstart != pret) + { + switch ((*pstart)->type) + { + case DEMANGLE_COMPONENT_RESTRICT: + (*pstart)->type = DEMANGLE_COMPONENT_RESTRICT_THIS; + break; + case DEMANGLE_COMPONENT_VOLATILE: + (*pstart)->type = DEMANGLE_COMPONENT_VOLATILE_THIS; + break; + case DEMANGLE_COMPONENT_CONST: + (*pstart)->type = DEMANGLE_COMPONENT_CONST_THIS; + break; + default: + break; + } + pstart = &d_left (*pstart); + } + } + return pret; } diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 64ccb92..70abf68 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -4198,3 +4198,8 @@ f1<int> _Z3fooi._omp_cpyfn.6 foo(int) [clone ._omp_cpyfn.6] foo +# +--format=gnu-v3 --no-params +_Z1fIKFvvES0_Evv +void f<void () const, void ()>() +f<void () const, void ()> |