diff options
| author | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-01-22 22:30:56 +0000 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-01-22 22:30:56 +0000 |
| commit | c21af61d6d6f4879e282f5f6742ea6a1ef9f41a3 (patch) | |
| tree | 7e0302f0159c0e6b56cb2ccf52bf0495bb49d100 /gcc/d | |
| parent | 8b5d2c55128d953d1d2d29362ea4522057bc016a (diff) | |
| download | gcc-c21af61d6d6f4879e282f5f6742ea6a1ef9f41a3.zip gcc-c21af61d6d6f4879e282f5f6742ea6a1ef9f41a3.tar.gz gcc-c21af61d6d6f4879e282f5f6742ea6a1ef9f41a3.tar.bz2 | |
d/dmd: Merge dmd upstream e21c07e84
Fixes bootstrap regression introduced by the previous merge.
Reviewed-on: https://github.com/dlang/dmd/pull/9283
From-SVN: r268167
Diffstat (limited to 'gcc/d')
| -rw-r--r-- | gcc/d/dmd/MERGE | 2 | ||||
| -rw-r--r-- | gcc/d/dmd/mtype.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE index e8ab8df..c1c6cc1 100644 --- a/gcc/d/dmd/MERGE +++ b/gcc/d/dmd/MERGE @@ -1,4 +1,4 @@ -180465274b72a2ff218449f6793af0fbaabbcaa3 +e21c07e84bd9668e1c0fc1f45e514c5fd76988e7 The first line of this file holds the git revision number of the last merge done from the dlang/dmd repository. diff --git a/gcc/d/dmd/mtype.c b/gcc/d/dmd/mtype.c index 09161a3..2a23cab 100644 --- a/gcc/d/dmd/mtype.c +++ b/gcc/d/dmd/mtype.c @@ -2326,7 +2326,7 @@ Identifier *Type::getTypeInfoIdent() int length = sprintf(name, "_D%lluTypeInfo_%s6__initZ", (unsigned long long) 9 + len, buf.data); //printf("%p, deco = %s, name = %s\n", this, deco, name); - assert(0 < length && length < namelen); // don't overflow the buffer + assert(0 < length && (size_t)length < namelen); // don't overflow the buffer Identifier *id = Identifier::idPool(name, length); |