diff options
author | DJ Delorie <dj@delorie.com> | 2011-08-06 18:40:24 +0000 |
---|---|---|
committer | DJ Delorie <dj@delorie.com> | 2011-08-06 18:40:24 +0000 |
commit | 89fa801a3cee0d402dfd3b672dfcd89f9fafd151 (patch) | |
tree | 3cdb0b639566e35b8b731dce881d10791d99d1ec /libiberty/cp-demangle.c | |
parent | 4491fae9cfe5d492ac49dda54be23b7f2ad7d521 (diff) | |
download | gdb-89fa801a3cee0d402dfd3b672dfcd89f9fafd151.tar.gz |
merge from gcc
Diffstat (limited to 'libiberty/cp-demangle.c')
-rw-r--r-- | libiberty/cp-demangle.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index f41856be6d0..d67a9e74e65 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -1280,6 +1280,7 @@ d_nested_name (struct d_info *di) /* <prefix> ::= <prefix> <unqualified-name> ::= <template-prefix> <template-args> ::= <template-param> + ::= <decltype> ::= ::= <substitution> @@ -1308,10 +1309,19 @@ d_prefix (struct d_info *di) <template-param> here. */ comb_type = DEMANGLE_COMPONENT_QUAL_NAME; - if (IS_DIGIT (peek) + if (peek == 'D') + { + char peek2 = d_peek_next_char (di); + if (peek2 == 'T' || peek2 == 't') + /* Decltype. */ + dc = cplus_demangle_type (di); + else + /* Destructor name. */ + dc = d_unqualified_name (di); + } + else if (IS_DIGIT (peek) || IS_LOWER (peek) || peek == 'C' - || peek == 'D' || peek == 'U' || peek == 'L') dc = d_unqualified_name (di); |