diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-09 18:56:52 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-09 19:00:35 +0200 |
| commit | 98866120092edfd7d5a7ae008db960dae8ab1523 (patch) | |
| tree | 5f8f01e69a689ae4b8d2ff66d380767a30806c8f /gcc/d/decl.cc | |
| parent | ef41587df9839d1dfc77dbc48a0830e42b36626e (diff) | |
| download | gcc-98866120092edfd7d5a7ae008db960dae8ab1523.zip gcc-98866120092edfd7d5a7ae008db960dae8ab1523.tar.gz gcc-98866120092edfd7d5a7ae008db960dae8ab1523.tar.bz2 | |
d: Merge upstream dmd 13d67c575.
Reviewed-on: https://github.com/dlang/dmd/pull/11224
gcc/d/ChangeLog:
* dmd/MERGE: Merge upstream dmd 13d67c575.
* d-builtins.cc (build_frontend_type): Update call to
TypeVector::create.
* d-frontend.cc (Global::_init): Move setting of errorLimit to ...
* d-lang.cc (d_init_options): ... here. Update for new field
location of errorLimit.
(d_post_options): Likewise.
* d-port.cc (Port::readwordLE): Update signature.
(Port::readwordBE): Likewise.
(Port::readlongLE): Likewise.
(Port::readlongBE): Likewise.
* decl.cc (get_symbol_decl): Update for new field types.
Diffstat (limited to 'gcc/d/decl.cc')
| -rw-r--r-- | gcc/d/decl.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/d/decl.cc b/gcc/d/decl.cc index bcee0b2..84aa42c 100644 --- a/gcc/d/decl.cc +++ b/gcc/d/decl.cc @@ -1134,8 +1134,12 @@ get_symbol_decl (Declaration *decl) { tree mangled_name; - if (decl->mangleOverride) - mangled_name = get_identifier (decl->mangleOverride); + if (decl->mangleOverride.length) + { + mangled_name = + get_identifier_with_length (decl->mangleOverride.ptr, + decl->mangleOverride.length); + } else mangled_name = get_identifier (d_mangle_decl (decl)); |