From patchwork Wed Nov 18 10:33:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 1402169 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (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=Su9BLbR8; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4CbfKs43Dkz9sTc for ; Wed, 18 Nov 2020 21:33:35 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F0327385803D; Wed, 18 Nov 2020 10:33:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F0327385803D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1605695613; bh=2n5N5KgwpalX/ReEnacvZ2wTr3Jbyhg2HkEJqpjBr0A=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Su9BLbR87GZMPQG54uGooYX9f9k0MZ9+x7erG7PfOQK8TidnFfYcsWh5CEVEk79gQ UsTADTcB/grMmanemOfbD1IZxOqKfZ/FmFm1X3jrTvYP6jsgCUT+65+K+fx+Y4tKHG zJxaeW58BdE09SNTqbAk8FX2Ze/U+8ZN0C/pP6YY= 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 [80.241.56.151]) by sourceware.org (Postfix) with ESMTPS id 28C3A385800D for ; Wed, 18 Nov 2020 10:33:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 28C3A385800D Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4CbfKh3ZKczQlL0; Wed, 18 Nov 2020 11:33:28 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id ehyvoMAKFkNt; Wed, 18 Nov 2020 11:33:21 +0100 (CET) To: gcc-patches@gcc.gnu.org Subject: [committed][GCC-10 backport] d: Explicitly determine which built-in copysign function to call. Date: Wed, 18 Nov 2020 11:33:18 +0100 Message-Id: <20201118103318.4098083-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 1.07 / 15.00 / 15.00 X-Rspamd-Queue-Id: 7F1B1171E X-Rspamd-UID: 00a8f5 X-Spam-Status: No, score=-16.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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 backports r11-4980 to GCC-10, as it fixes an ICE that could occur on some targets. Regression tested on x86_64-linux-gnu and committed to branch. Regards Iain --- gcc/d/ChangeLog: * intrinsics.cc (expand_intrinsic_copysign): Explicitly determine which built-in copysign function to call. (cherry picked from commit d975d6dce98a3e26ddd304d50dad2786b3acecc4) --- gcc/d/intrinsics.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gcc/d/intrinsics.cc b/gcc/d/intrinsics.cc index c32819885bb..51cbd7b92fd 100644 --- a/gcc/d/intrinsics.cc +++ b/gcc/d/intrinsics.cc @@ -430,11 +430,14 @@ expand_intrinsic_copysign (tree callexp) from = fold_convert (type, from); /* Which variant of __builtin_copysign* should we call? */ - tree builtin = mathfn_built_in (type, BUILT_IN_COPYSIGN); - gcc_assert (builtin != NULL_TREE); + built_in_function code = (type == float_type_node) ? BUILT_IN_COPYSIGNF + : (type == double_type_node) ? BUILT_IN_COPYSIGN + : (type == long_double_type_node) ? BUILT_IN_COPYSIGNL + : END_BUILTINS; - return call_builtin_fn (callexp, DECL_FUNCTION_CODE (builtin), 2, - to, from); + gcc_assert (code != END_BUILTINS); + + return call_builtin_fn (callexp, code, 2, to, from); } /* Expand a front-end intrinsic call to pow(). This takes two arguments, the