diff options
author | Iain Buclaw <ibuclaw@gdcproject.org> | 2022-03-21 16:52:40 +0100 |
---|---|---|
committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2022-03-21 19:51:50 +0100 |
commit | fbdaa58162ee4189f441b75170af89215465d189 (patch) | |
tree | 77c5816b721cad2691bea1d228cb5ecc31568f9c /gcc/d/d-lang.cc | |
parent | 4a3073f04e8b7987ad7bfe1bc23bfeb1d627ee6a (diff) | |
download | gcc-fbdaa58162ee4189f441b75170af89215465d189.zip gcc-fbdaa58162ee4189f441b75170af89215465d189.tar.gz gcc-fbdaa58162ee4189f441b75170af89215465d189.tar.bz2 |
d: Merge upstream dmd 2503f17e5, phobos a74fa63e6.
D front-end changes:
- Import dmd mainline development.
- Removed internal d_intN and d_unsN aliases to stdint types, which
caused a regression on Solaris where int8_t is a char (PR104911).
Phobos changes:
- Import phobos mainline development.
PR d/104911
gcc/d/ChangeLog:
* dmd/MERGE: Merge upstream dmd 2503f17e5.
* d-convert.cc (convert_expr): Replace d_uns64 with dinteger_t.
* d-lang.cc: Remove dmd/root/file.h include.
(d_handle_option): Update for new front-end interface.
(d_parse_file): Likewise.
libphobos/ChangeLog:
* src/MERGE: Merge upstream phobos a74fa63e6.
Diffstat (limited to 'gcc/d/d-lang.cc')
-rw-r--r-- | gcc/d/d-lang.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc index f887840..4a7aa89 100644 --- a/gcc/d/d-lang.cc +++ b/gcc/d/d-lang.cc @@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see #include "dmd/mangle.h" #include "dmd/module.h" #include "dmd/mtype.h" -#include "dmd/root/file.h" #include "dmd/target.h" #include "opts.h" @@ -579,7 +578,7 @@ d_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value, global.params.fix16997 = value; global.params.markdown = value; global.params.noSharedAccess = value; - global.params.rvalueRefParam = value; + global.params.rvalueRefParam = FeatureState::enabled; global.params.inclusiveInContracts = value; global.params.shortenedMethods = value; break; @@ -625,7 +624,7 @@ d_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value, break; case OPT_fpreview_rvaluerefparam: - global.params.rvalueRefParam = value; + global.params.rvalueRefParam = FeatureState::enabled; break; case OPT_fpreview_shortenedmethods: @@ -1069,9 +1068,8 @@ d_parse_file (void) /* Overwrite the source file for the module, the one created by Module::create would have a forced a `.d' suffix. */ - m->srcBuffer = FileBuffer::create (); - m->srcBuffer->data.length = len; - m->srcBuffer->data.ptr = buffer; + m->src.length = len; + m->src.ptr = buffer; } else { @@ -1108,7 +1106,7 @@ d_parse_file (void) m->importedFrom = m; m->parse (); - if (m->isDocFile) + if (m->filetype == FileType::ddoc) { gendocfile (m); /* Remove M from list of modules. */ @@ -1146,7 +1144,8 @@ d_parse_file (void) for (size_t i = 0; i < modules.length; i++) { Module *m = modules[i]; - if (m->isHdrFile || (d_option.fonly && m != Module::rootModule)) + if (m->filetype == FileType::dhdr + || (d_option.fonly && m != Module::rootModule)) continue; if (global.params.verbose) @@ -1374,7 +1373,7 @@ d_parse_file (void) /* Skip generating code for header files, or when the module wasn't specified by `-fonly=`. */ - if ((m->isHdrFile && m != main_module) + if ((m->filetype == FileType::dhdr && m != main_module) || (d_option.fonly && m != Module::rootModule)) continue; @@ -1421,7 +1420,8 @@ d_parse_file (void) for (size_t i = 0; i < modules.length; i++) { Module *m = modules[i]; - if (m->isHdrFile || (d_option.fonly && m != Module::rootModule)) + if (m->filetype == FileType::dhdr + || (d_option.fonly && m != Module::rootModule)) continue; remove (m->hdrfile.toChars ()); |