From patchwork Mon Jun 8 20:16:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 1305401 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=owmZRmSb; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49gl0G2Mgdz9sRN for ; Tue, 9 Jun 2020 06:17:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 174203959C2C; Mon, 8 Jun 2020 20:16:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 174203959C2C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1591647418; bh=2a6oOQhz4RMVdNZ7dhaP207XDskx1XdL6jcsrnRMpOw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=owmZRmSbqqdTo/oCGOoqqS/aVxerfFd0hquFsTnzqOSV5tqFGf7zC2ehu01e8VVum LsoUUtDgStQEp7lO3QYTsb6w4PciGVTfaNSMoZbd6A8g/hYhn/zBUvQsi5lvZHXmLZ olQOMh75aAOmwsoDIBDRSlC3pwA30mPVoSc54yAk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [IPv6:2001:67c:2050::465:201]) by sourceware.org (Postfix) with ESMTPS id 63C04388E80D for ; Mon, 8 Jun 2020 20:16:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 63C04388E80D Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 49gl050f2TzQlKB; Mon, 8 Jun 2020 22:16:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id tKM5mtRlhAvb; Mon, 8 Jun 2020 22:16:50 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [committed] d: Fix regression caused by recent refactoring (PR95573) Date: Mon, 8 Jun 2020 22:16:48 +0200 Message-Id: <20200608201648.9724-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0C0741761 X-Rspamd-Score: 1.29 / 15.00 / 15.00 X-Spam-Status: No, score=-17.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Buclaw via Gcc-patches From: Iain Buclaw Reply-To: Iain Buclaw Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, This parch merges the D front-end implementation with upstream dmd 5041e56f1. Fixing a small regression made by one of the refactorings. Bootstrapped and regression tested on x86_64-linux-gnu, and committed to mainline. Regards Iain. gcc/d/ChangeLog: PR d/95573 * dmd/MERGE: Merge upstream dmd 5041e56f1. --- 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 }