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-convert.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-convert.cc')
| -rw-r--r-- | gcc/d/d-convert.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/d/d-convert.cc b/gcc/d/d-convert.cc index 5a7a64f..3a6a32a 100644 --- a/gcc/d/d-convert.cc +++ b/gcc/d/d-convert.cc @@ -518,8 +518,8 @@ convert_expr (tree exp, Type *etype, Type *totype) else if (tbtype->ty == TY::Tarray) { /* Assume tvoid->size() == 1. */ - d_uns64 fsize = ebtype->nextOf ()->toBasetype ()->size (); - d_uns64 tsize = tbtype->nextOf ()->toBasetype ()->size (); + dinteger_t fsize = ebtype->nextOf ()->toBasetype ()->size (); + dinteger_t tsize = tbtype->nextOf ()->toBasetype ()->size (); if (fsize != tsize) { |