diff options
| author | DJ Delorie <dj@redhat.com> | 2010-05-06 21:40:04 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2010-05-06 21:40:04 +0000 |
| commit | cf383746fa2c9023feaaf737b2c571e96a55aef5 (patch) | |
| tree | f426d7a419882e87c0d20ca2cea17eda0d19c32b /libiberty/cp-demangle.c | |
| parent | 7f502d6c5a69837ad293d942ffa18fc16b8d0e3a (diff) | |
| download | gdb-cf383746fa2c9023feaaf737b2c571e96a55aef5.zip gdb-cf383746fa2c9023feaaf737b2c571e96a55aef5.tar.gz gdb-cf383746fa2c9023feaaf737b2c571e96a55aef5.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty/cp-demangle.c')
| -rw-r--r-- | libiberty/cp-demangle.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 98c64db5..6db1f78 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -1987,6 +1987,8 @@ cplus_demangle_builtin_types[D_BUILTIN_TYPE_COUNT] = /* 29 */ { NL ("half"), NL ("half"), D_PRINT_FLOAT }, /* 30 */ { NL ("char16_t"), NL ("char16_t"), D_PRINT_DEFAULT }, /* 31 */ { NL ("char32_t"), NL ("char32_t"), D_PRINT_DEFAULT }, + /* 32 */ { NL ("decltype(nullptr)"), NL ("decltype(nullptr)"), + D_PRINT_DEFAULT }, }; CP_STATIC_IF_GLIBCPP_V3 @@ -2221,6 +2223,12 @@ cplus_demangle_type (struct d_info *di) ret = d_vector_type (di); break; + case 'n': + /* decltype(nullptr) */ + ret = d_make_builtin_type (di, &cplus_demangle_builtin_types[32]); + di->expansion += ret->u.s_builtin.type->len; + break; + default: return NULL; } |