From: Iain Buclaw Date: Mon, 8 Jun 2020 20:11:00 +0000 (+0200) Subject: d: Fix regression caused by recent refactoring X-Git-Tag: basepoints/gcc-12~7187 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fceefeee9a10cfba621d215f011a58badc246ad;p=thirdparty%2Fgcc.git d: Fix regression caused by recent refactoring gcc/d/ChangeLog: PR d/95573 * dmd/MERGE: Merge upstream dmd 5041e56f1. --- diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE index e2ebd27b19b7..163a70ddb26f 100644 --- a/gcc/d/dmd/MERGE +++ b/gcc/d/dmd/MERGE @@ -1,4 +1,4 @@ -955b8b36f8bbacc59745b44cdf48ef1ddeb01bcd +5041e56f12806f13a8fa5e98a6c98279636a8d2a 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 7684516da997..011aff7ec939 100644 --- a/gcc/d/dmd/mtype.c +++ b/gcc/d/dmd/mtype.c @@ -9384,7 +9384,7 @@ Type *Parameter::isLazyArray() TypeDelegate *td = (TypeDelegate *)tel; TypeFunction *tf = td->next->toTypeFunction(); - if (!tf->parameterList.varargs == VARARGnone && tf->parameterList.length() == 0) + if (tf->parameterList.varargs == VARARGnone && tf->parameterList.length() == 0) { return tf->next; // return type of delegate }