From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2066) id 1C9D439C2809; Wed, 10 Jun 2020 03:45:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1C9D439C2809 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1591760759; bh=9gRnLHnyIThwXcWeBA/zeAWcStUbER55UpbkXAjhpXg=; h=From:To:Subject:Date:From; b=CuJL0lczcWInuLdZiMhQBeefGQvR3zxNXD6kAkMIxP9Zc2ysQEqZt98TzoHUB1Vls QxxretjQhBNgjgHNqNfDzgA9yAJ+wuxDEMu5HvtPSXzXgBx+ERlY2cLsvJL6td0Unq nk3TA10E0lvXS1sURheYBnWHySlFXLTjOkVG/2yU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jiu Fu Guo To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/guojiufu/heads/guojiufu-branch)] d: Fix regression caused by recent refactoring X-Act-Checkin: gcc X-Git-Author: Iain Buclaw X-Git-Refname: refs/users/guojiufu/heads/guojiufu-branch X-Git-Oldrev: 49a09af117be32adf230efd2c52a41f810b9ee04 X-Git-Newrev: 5fceefeee9a10cfba621d215f011a58badc246ad Message-Id: <20200610034559.1C9D439C2809@sourceware.org> Date: Wed, 10 Jun 2020 03:45:59 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2020 03:45:59 -0000 https://gcc.gnu.org/g:5fceefeee9a10cfba621d215f011a58badc246ad commit 5fceefeee9a10cfba621d215f011a58badc246ad Author: Iain Buclaw Date: Mon Jun 8 22:11:00 2020 +0200 d: Fix regression caused by recent refactoring gcc/d/ChangeLog: PR d/95573 * dmd/MERGE: Merge upstream dmd 5041e56f1. Diff: --- 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 e2ebd27b19b..163a70ddb26 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 7684516da99..011aff7ec93 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 }