diff options
| author | DJ Delorie <dj@delorie.com> | 2011-10-10 21:02:44 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2011-10-10 21:02:44 +0000 |
| commit | 1261ce54b264e20cf9162d112021273fc842df8a (patch) | |
| tree | f1d9c5b03151c18a40544c470ca28870abe35674 /libiberty | |
| parent | f5b32a8906921195aa7ab3d36fddeb99c55749d1 (diff) | |
| download | gdb-1261ce54b264e20cf9162d112021273fc842df8a.tar.gz | |
merge from gcc
Diffstat (limited to 'libiberty')
| -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 59460e43f09..6859afa04c3 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 32318e89fd8..c7afef01f6d 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 64ccb929680..70abf681ae8 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 ()> |