From patchwork Thu Jul 30 21:45:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 1339133 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=brDTUDOD; 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 4BHkVf3zzHz9sT6 for ; Fri, 31 Jul 2020 07:45:45 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0CBA73857C7D; Thu, 30 Jul 2020 21:45:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0CBA73857C7D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1596145542; bh=yhpe3jDm1xo321yc/Ub7DHbRC5Wd5oU6A5OCPRM9ENo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=brDTUDODG9t4jw6C3MpDOo5AWUYUKzTY0cqKsxYo1GTTIB1zSsbJQ8l/gQBD9PnfU yivUrQkEFbSt4mLFjvQEn7l2fOF7oR1W1c7/u8Hsu8bRC7o/3gJLf1rJ7VdY+qBcX9 4YuxYB0K+4IE0CBq1t9nqKJanMADXti/yUYvaicA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050::465:101]) by sourceware.org (Postfix) with ESMTPS id D63413858D35 for ; Thu, 30 Jul 2020 21:45:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D63413858D35 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4BHkVT32TSzKmWR; Thu, 30 Jul 2020 23:45:37 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id 0qKAn2MBw2Qx; Thu, 30 Jul 2020 23:45:33 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [committed] d: Fix ICE in expand_intrinsic_vaarg (PR96140) Date: Thu, 30 Jul 2020 23:45:31 +0200 Message-Id: <20200730214531.789810-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-MBO-SPAM-Probability: 1 X-Rspamd-Score: 0.21 / 15.00 / 15.00 X-Rspamd-Queue-Id: 209D4177D X-Rspamd-UID: 7b8ce5 X-Spam-Status: No, score=-16.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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 patch fixes an ICE in the D front-end in the va_arg intrinsic functions. Both intrinsics did not handler the case where the va_list object comes from a ref parameter. Bootstrapped and regression tested on x86_64-linux-gnu, committed to mainline. Regards Iain. --- gcc/d/ChangeLog: PR d/96140 * intrinsics.cc (expand_intrinsic_vaarg): Handle ref parameters as arguments to va_arg(). (expand_intrinsic_vastart): Handle ref parameters as arguments to va_start(). gcc/testsuite/ChangeLog: PR d/96140 * gdc.dg/pr96140.d: New test. --- gcc/d/intrinsics.cc | 23 +++++++++++++++++++---- gcc/testsuite/gdc.dg/pr96140.d | 15 +++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gdc.dg/pr96140.d diff --git a/gcc/d/intrinsics.cc b/gcc/d/intrinsics.cc index 28667c63e17..8eec0af60ee 100644 --- a/gcc/d/intrinsics.cc +++ b/gcc/d/intrinsics.cc @@ -549,8 +549,17 @@ expand_intrinsic_vaarg (tree callexp) { parmn = CALL_EXPR_ARG (callexp, 1); STRIP_NOPS (parmn); - gcc_assert (TREE_CODE (parmn) == ADDR_EXPR); - parmn = TREE_OPERAND (parmn, 0); + + /* The `ref' argument to va_arg is either an address or reference, + get the value of it. */ + if (TREE_CODE (parmn) == PARM_DECL && POINTER_TYPE_P (TREE_TYPE (parmn))) + parmn = build_deref (parmn); + else + { + gcc_assert (TREE_CODE (parmn) == ADDR_EXPR); + parmn = TREE_OPERAND (parmn, 0); + } + type = TREE_TYPE (parmn); } @@ -584,10 +593,16 @@ expand_intrinsic_vastart (tree callexp) /* The va_list argument should already have its address taken. The second argument, however, is inout and that needs to be fixed to prevent a warning. Could be casting, so need to check type too? */ - gcc_assert (TREE_CODE (ap) == ADDR_EXPR && TREE_CODE (parmn) == ADDR_EXPR); + gcc_assert (TREE_CODE (ap) == ADDR_EXPR + || (TREE_CODE (ap) == PARM_DECL + && POINTER_TYPE_P (TREE_TYPE (ap)))); /* Assuming nobody tries to change the return type. */ - parmn = TREE_OPERAND (parmn, 0); + if (TREE_CODE (parmn) != PARM_DECL) + { + gcc_assert (TREE_CODE (parmn) == ADDR_EXPR); + parmn = TREE_OPERAND (parmn, 0); + } return call_builtin_fn (callexp, BUILT_IN_VA_START, 2, ap, parmn); } diff --git a/gcc/testsuite/gdc.dg/pr96140.d b/gcc/testsuite/gdc.dg/pr96140.d new file mode 100644 index 00000000000..d25bb5d3360 --- /dev/null +++ b/gcc/testsuite/gdc.dg/pr96140.d @@ -0,0 +1,15 @@ +// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96140 +// { dg-do compile } +module pr94140; + +import core.stdc.stdarg; + +void test_va_arg(ref int a, ...) +{ + return va_arg!int(_argptr, a); +} + +void test_va_start(ref va_list a, ...) +{ + return va_start(a, a); +}