From e823a10e1f06a197e271ed8f31766d6e55a80c37 Mon Sep 17 00:00:00 2001 From: ibuclaw Date: Tue, 22 Jan 2019 22:30:56 +0000 Subject: [PATCH] d/dmd: Merge dmd upstream e21c07e84 Fixes bootstrap regression introduced by the previous merge. Reviewed-on: https://github.com/dlang/dmd/pull/9283 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@268167 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/d/dmd/MERGE | 2 +- 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 e8ab8df4f7bf..c1c6cc145c4b 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 09161a313eef..2a23cab74fd2 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); -- 2.47.2