From patchwork Wed Jun 15 12:52:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Earnshaw X-Patchwork-Id: 55102 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C639B3838645 for ; Wed, 15 Jun 2022 12:53:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C639B3838645 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1655297601; bh=FNZ5HaEN08vx1y8n5sNm8xu+OWeb4qy6To4+DSNX2Rc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=vNT5JWVXVQv8T2bD9c9wHpErligut4bXLD1iSV5wQwo3Fd2gvI8rAvcZAsnmcTNGD IW4EbNW5xImdSCe2h2D2tOWbYJs6dU5OSzzOXN/QFKrwsz98bgFtAYeFq1XttX2GBB LUnPhG9Ak/OFTIiXvopf2QcFr0bLHmykt0E7sups= 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 01EC93858287 for ; Wed, 15 Jun 2022 12:52:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 01EC93858287 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 B19BA152B; Wed, 15 Jun 2022 05:52:51 -0700 (PDT) Received: from e126323.arm.com (unknown [10.57.39.244]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 197233F66F; Wed, 15 Jun 2022 05:52:50 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [committed] arm: fix thinko in arm_bfi_1_p() [PR105974] Date: Wed, 15 Jun 2022 13:52:39 +0100 Message-Id: <20220615125239.3587144-1-rearnsha@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-21.6 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, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Earnshaw via Gcc-patches From: Richard Earnshaw Reply-To: Richard Earnshaw Cc: Richard Earnshaw Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" I clearly wasn't thinking straight when I wrote the arm_bfi_1_p function and used XUINT rather than UINTVAL when extracting CONST_INT values. It seemed to work in testing, but was incorrect and failed RTL checking. Fixed thusly: gcc/ChangeLog: PR target/105974 * config/arm/arm.cc (arm_bfi_1_p): Use UINTVAL instead of XUINT. --- gcc/config/arm/arm.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc index 2a76c7b9a72..5aa48fc7664 100644 --- a/gcc/config/arm/arm.cc +++ b/gcc/config/arm/arm.cc @@ -10211,15 +10211,15 @@ arm_bfi_1_p (rtx op0, rtx op1, rtx *sub0, rtx *sub1) if (!CONST_INT_P (XEXP (op0, 1))) return false; - const1 = XUINT (XEXP (op0, 1), 0); + const1 = UINTVAL (XEXP (op0, 1)); if (!CONST_INT_P (XEXP (op1, 1)) - || ~XUINT (XEXP (op1, 1), 0) != const1) + || ~UINTVAL (XEXP (op1, 1)) != const1) return false; if (GET_CODE (XEXP (op0, 0)) == ASHIFT && CONST_INT_P (XEXP (XEXP (op0, 0), 1))) { - const2 = XUINT (XEXP (XEXP (op0, 0), 1), 0); + const2 = UINTVAL (XEXP (XEXP (op0, 0), 1)); *sub0 = XEXP (XEXP (op0, 0), 0); } else