From patchwork Mon Oct 14 11:13:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Andre Vieira (lists)" X-Patchwork-Id: 1996827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XRvm32d1Zz1xsc for ; Mon, 14 Oct 2024 22:15:31 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 842D63856DC1 for ; Mon, 14 Oct 2024 11:15:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id CB2D63858428 for ; Mon, 14 Oct 2024 11:14:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CB2D63858428 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CB2D63858428 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728904457; cv=none; b=u9riiu4CWUB1zI2QagPeNwBwHWAT2qJquKwFN7iQ4PWChaKnsyIWNdYNM6nOQQzVTXSYnpmphUQdgyPCHzGEYNzj1wQg2XDNNF4uQI2JvlSsuoTzVy3h3zDsb7A1/a7F+3XRNbDoC4WrAfdpT568wDP1xmZdZCNqIFwnTFUQM+c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728904457; c=relaxed/simple; bh=OskHBfKg0oaPg346k6Mb2BWiAK5+OKhYaG9gNDmQNLw=; h=Message-ID:Date:MIME-Version:To:From:Subject; b=PlHsPsoQa+OF7CrobFru+gwyXYM4NZPhja8i5jbkBzusigR9qKGx0QC9hWJBZPA/27iVpGFjg2mFQSBuomtM55gYi4TPuN4/XxQ1LMX22FyKmPMnxdXcNbwjxnh9o35wYG+hxbfF3kvvrV40ID/bF1bNMsouOMhM7aokOxhPMQo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 11F3C1424; Mon, 14 Oct 2024 04:14:36 -0700 (PDT) Received: from [10.57.23.126] (unknown [10.57.23.126]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D20D63F51B; Mon, 14 Oct 2024 04:14:05 -0700 (PDT) Message-ID: <98276dae-6589-4af9-bc5f-76cfd80b1a0d@arm.com> Date: Mon, 14 Oct 2024 12:13:58 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "gcc-patches@gcc.gnu.org" Cc: Richard Biener , Andrew Pinski From: "Andre Vieira (lists)" Subject: fold-const: Fix BIT_INSERT_EXPR folding for BYTES_BIG_ENDIAN [PR116997] X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Hi, This patch fixes constant folding of BIT_INSER_EXPR for BYTES_BIG_ENDIAN targets. Regression tested on aarch64be-none-elf. Almost committed this as obvious, but I wanted to double check the testcase with a maintainer. I decided to not make the test be big-endian specific, nor to add any specific checks, since before this patch it would abort on a big-endian target and fail an execution test. Just thought that anything else might end up being somewhat sensitive to testisms. OK for trunk? gcc/ChangeLog: PR middle-end/116997 * fold-const.cc (fold_ternary_loc): Fix BIT_INSERT_EXPR constant folding for BYTES_BIG_ENDIAN targets. gcc/testsuite/ChangeLog: * gcc.dg/vect/pr116997.c: New test. Co-author: Andrew Pinski diff --git a/gcc/fold-const.cc b/gcc/fold-const.cc index 0578f42ac0c51566efe5eb8f75e645518642728c..6f73f648b70c4947fc9f26741ce099f8b9de8022 100644 --- a/gcc/fold-const.cc +++ b/gcc/fold-const.cc @@ -13712,6 +13712,8 @@ fold_ternary_loc (location_t loc, enum tree_code code, tree type, { unsigned HOST_WIDE_INT bitpos = tree_to_uhwi (op2); unsigned bitsize = TYPE_PRECISION (TREE_TYPE (arg1)); + if (BYTES_BIG_ENDIAN) + bitpos = TYPE_PRECISION (type) - bitpos - bitsize; wide_int tem = (wi::to_wide (arg0) & wi::shifted_mask (bitpos, bitsize, true, TYPE_PRECISION (type))); diff --git a/gcc/testsuite/gcc.dg/vect/pr116997.c b/gcc/testsuite/gcc.dg/vect/pr116997.c new file mode 100644 index 0000000000000000000000000000000000000000..4563fc2bfb6f86d4e8adc7160b71760003479c9e --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/pr116997.c @@ -0,0 +1,18 @@ +/* PR 116997. */ +struct S0 +{ + unsigned f0; + signed f2 : 11; + signed : 6; +} GlobS, *Ptr = &GlobS; + +const struct S0 Initializer = {7, 3}; + +int main (void) +{ + for (unsigned i = 0; i <= 2; i++) + *Ptr = Initializer; + if (GlobS.f2 != 3) + __builtin_abort (); + return 0; +}