diff options
| -rw-r--r-- | libiberty/d-demangle.c | 12 | ||||
| -rw-r--r-- | libiberty/testsuite/d-demangle-expected | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/libiberty/d-demangle.c b/libiberty/d-demangle.c index 822c758..c34f918 100644 --- a/libiberty/d-demangle.c +++ b/libiberty/d-demangle.c @@ -573,9 +573,11 @@ dlang_attributes (string *decl, const char *mangled) case 'g': case 'h': case 'k': + case 'n': /* inout parameter is represented as 'Ng'. vector parameter is represented as 'Nh'. - return paramenter is represented as 'Nk'. + return parameter is represented as 'Nk'. + typeof(*null) parameter is represented as 'Nn'. If we see this, then we know we're really in the parameter list. Rewind and break. */ mangled--; @@ -787,6 +789,12 @@ dlang_type (string *decl, const char *mangled, struct dlang_info *info) string_append (decl, ")"); return mangled; } + else if (*mangled == 'n') /* typeof(*null) */ + { + mangled++; + string_append (decl, "typeof(*null)"); + return mangled; + } else return NULL; case 'A': /* dynamic array (T[]) */ @@ -884,7 +892,7 @@ dlang_type (string *decl, const char *mangled, struct dlang_info *info) /* Basic types */ case 'n': mangled++; - string_append (decl, "none"); + string_append (decl, "typeof(null)"); return mangled; case 'v': mangled++; diff --git a/libiberty/testsuite/d-demangle-expected b/libiberty/testsuite/d-demangle-expected index ba0ffed..00036e7 100644 --- a/libiberty/testsuite/d-demangle-expected +++ b/libiberty/testsuite/d-demangle-expected @@ -83,7 +83,11 @@ demangle.test(ulong) # --format=dlang _D8demangle4testFnZv -demangle.test(none) +demangle.test(typeof(null)) +# +--format=dlang +_D8demangle4testFNnZv +demangle.test(typeof(*null)) # --format=dlang _D8demangle4testFoZv |