diff options
| author | DJ Delorie <dj@redhat.com> | 2003-12-20 16:06:10 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2003-12-20 16:06:10 +0000 |
| commit | 2730f65149c0106eca3b7967b4ba7fe970b0e362 (patch) | |
| tree | f121696e5a90507f58e45a2d4332f7fac8b4df23 /libiberty | |
| parent | 59207364ed59269dff01517926f14720ac8a0cba (diff) | |
| download | binutils-gdb-2730f65149c0106eca3b7967b4ba7fe970b0e362.tar.gz | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 7 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 4 |
3 files changed, 17 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 695c45059dc..20d6552a7d3 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2003-12-20 Ian Lance Taylor <ian@wasabisystems.com> + + * cp-demangle.c (d_identifier): In Java mode, skip an optional '$' + after the identifier. + * testsuite/demangle-expected: Add test case. + 2003-12-19 Ian Lance Taylor <ian@wasabisystems.com> Fix for PR c++/13447: diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 27e09df7288..1e5684c1520 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -1341,6 +1341,13 @@ d_identifier (di, len) name = d_str (di); d_advance (di, len); + /* A Java mangled name may have a trailing '$' if it is a C++ + keyword. This '$' is not included in the length count. We just + ignore the '$'. */ + if ((di->options & DMGL_JAVA) != 0 + && d_peek_char (di) == '$') + d_advance (di, 1); + /* Look for something which looks like a gcc encoding of an anonymous namespace, and replace it with a more user friendly name. */ diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 8bae90eb0a5..dd36b7a24fd 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -2591,6 +2591,10 @@ Prim.i(int, boolean, byte, double, float, char, java.lang.String, short, long) _ZN4java4util14Map__U24_Entry11class__U24_E java.util.Map$Entry.class$ # +--format=java +_ZN3org7eclipse3cdt5debug8internal4core5model9CVariable6sizeof$Ev +org.eclipse.cdt.debug.internal.core.model.CVariable.sizeof() +# --format=hp _Utf58_0_1__1_2147483647__2147483648 _Utf58_0_1__1_2147483647__2147483648 |