From patchwork Thu Oct 3 08:19:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georg-Johann Lay X-Patchwork-Id: 1992259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gjlay.de header.i=@gjlay.de header.a=rsa-sha256 header.s=strato-dkim-0002 header.b=UkJMMFHk; dkim=pass header.d=gjlay.de header.i=@gjlay.de header.a=ed25519-sha256 header.s=strato-dkim-0003 header.b=Z5wsRiJU; dkim-atps=neutral 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 4XK4NB0SWzz1xtq for ; Thu, 3 Oct 2024 18:19:38 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E3C41385DC3C for ; Thu, 3 Oct 2024 08:19:35 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.163]) by sourceware.org (Postfix) with ESMTPS id 54748385842D for ; Thu, 3 Oct 2024 08:19:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 54748385842D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gjlay.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=gjlay.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 54748385842D Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=81.169.146.163 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1727943555; cv=pass; b=R6gpeU8TtsHLQqk7QtmbMOdHWChLCZ9Klzi4LDqrddpu9K2XOr3/BWftUHubAvQZCUnSpnDl7J6Dm2uTLSHAqlVdQ7yA0hL84YTUwsmr6qthnaTozXSPXC9lNJwTwwrWEaDNeGgA4eas1Vui4eXp3yKfcl9CSk772e29ieBgcxE= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1727943555; c=relaxed/simple; bh=+9ZDoIM9mb+HdKKd9ffnzEAIBRseTZIU7eTDpW87KW0=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:MIME-Version:From: To:Subject; b=LTQa74kNEIRBU6u3Bv32dIBBGqfbXAI3Vq/EhxsPSJi7HHM3yDSuCUPIn5HZMYNcDDH9w6Nr9cV1lBM/QtKM4vrWeMXrvu8Ucujc8gAtMydZl/36/1nl9n0oXV6D1D6jyY6saQLF3/5eGH2SAsK4fShDiPStUt6Dw68djmT+SHM= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; t=1727943551; cv=none; d=strato.com; s=strato-dkim-0002; b=Ojo75ZhNUvuDtxtizGf92MHicHhc6m3VOWJdWN/MG4EUZhOrjYvLM6ueExr7JgClt0 gSMxTQsW7wQihK9CIbGDxoygnfmL9VOaVUajgg6aZmpBm1bzxL+GwXysLT+E+lkMr9lt 3LkBN0P+iop2lcrH9kaQRiB4ZmvD6ywsGaY+231/FL1G2jewUPcRZDHfrqn2lTDlu+nw SUNg7KZtLjPUjrl/grH8UDsF3Vjorfn71qGpR2sLIe4HeNmdXda/xWKJvFPGHFk5FJqB Scw2905ziuEsyhF4xFf0Ftaa8PswYhC/vUQMzF+1rscLOuZJ6tC+XewPMgpWSYrG/Tjq x4wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1727943551; s=strato-dkim-0002; d=strato.com; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=71kAGC3CIswaIIoSDaRu85L20Q6ZMbWd7bPB/ygrmmA=; b=db5G3y65WVexE/2eEM7Q0NeTI0WgebO+x+Y91JfoSxsheCgGMlYu+P8HMweVVbt7Mn 8KEBvoUpiDy4rBhsTlib+L++W+JD25TGakvl9wz0KXJp5twDE0oDXsr3GV1P4vgZUB5s djBqIYcZzj0Gm+NyhcNYEfk+7QliaB7vbZFQZkUyaom4C0TBtmk8NPhG8MU9+GsSZILp dnLya+HfxSu80O6WQ8wPQ7TEECLAq5Hx5QDcAmF8w9vH44qAb/Ze1ywzvluhCiqYHXmk 0BPJbxiJ1aPI16gJ2RmFNUe6jEIpLizEytUdVWDWDBZEjk21xU1Zgh24clbaF6+uYUy8 +l7g== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1727943551; s=strato-dkim-0002; d=gjlay.de; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=71kAGC3CIswaIIoSDaRu85L20Q6ZMbWd7bPB/ygrmmA=; b=UkJMMFHkEq3WfdLUFMFlEVqRzsVqdxkUTcaYixlqXLSQG9GLVSh3V0GqPSwNXrVW77 P/+1Jpp3XfR/vTEDkUD12J3jpvju4oVXByPsXGB8D+77iJ3D02qA2qSm6OTMG6+ZAmbF tUGixHw8BK4FCTRw4cKOvb7jvhzUlBG4TfAwhnZV35Xz7xkK4x9t3h4FC7HEJ/hqMbAM 6djItiQZbOtSSDXy34tY3aADwaqzg3JfHae62OCWi/rQRUi9EONbK0e1r7gfQUKpjuWr MUDad5LEuJJp9ZT4Ck/jUtL1ZD51A8lmq/RVPxkssmfQWGm83kBK5cxmN3PusrJP5zi1 e+tQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1727943551; s=strato-dkim-0003; d=gjlay.de; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=71kAGC3CIswaIIoSDaRu85L20Q6ZMbWd7bPB/ygrmmA=; b=Z5wsRiJU1eZuIZmLG7b9NoLt2biGZko0TyAYBbag4Usg+NtDw9XtBVLTYiSR1Xu+vo H1xGlhh0bk7J8pu0wUAQ== X-RZG-AUTH: ":LXoWVUeid/7A29J/hMvvT3koxZnKXKoq0dKoR0vVqyQb0R7G22gRW+Qr5Q==" Received: from [192.168.2.102] by smtp.strato.de (RZmta 51.2.8 AUTH) with ESMTPSA id x2e25d0938JBy3u (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Thu, 3 Oct 2024 10:19:11 +0200 (CEST) Message-ID: Date: Thu, 3 Oct 2024 10:19:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Georg-Johann Lay Content-Language: en-US To: "gcc-patches@gcc.gnu.org" , Denis Chertykov Subject: [patch,avr] Fix PR116953 - jump_over_one_insn_p clobbers recog_data.operand in avr_out_sbxx_branch X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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 avr_out_sbxx_branch calls jump_over_one_insn_p which may clobber recog_data.operand as is calls extract on the next insn. A fix is to make a copy of avr_out_sbxx_branch`s incoming operands. Ok to apply? Johann --- AVR: target/116953 - ICE due to operands clobber in avr_out_sbxx_branch. PR target/116953 gcc/ * config/avr/avr.cc (avr_out_sbxx_branch): Work on a copy of the operands rather than on operands itself, which is just recog_data.operand and may be clobbered by jump_over_one_insn_p. gcc/testsuite/ * gcc.target/avr/torture/pr116953.c: New test. AVR: target/116953 - ICE due to operands clobber in avr_out_sbxx_branch. PR target/116953 gcc/ * config/avr/avr.cc (avr_out_sbxx_branch): Work on a copy of the operands rather than on operands itself, which is just recog_data.operand and may be clobbered by jump_over_one_insn_p. gcc/testsuite/ * gcc.target/avr/torture/pr116953.c: New test. diff --git a/gcc/config/avr/avr.cc b/gcc/config/avr/avr.cc index 92013c3845d..735d05b1e74 100644 --- a/gcc/config/avr/avr.cc +++ b/gcc/config/avr/avr.cc @@ -13603,8 +13603,12 @@ avr_hard_regno_rename_ok (unsigned int old_reg, unsigned int new_reg) Operand 3: label to jump to if the test is true. */ const char * -avr_out_sbxx_branch (rtx_insn *insn, rtx operands[]) +avr_out_sbxx_branch (rtx_insn *insn, rtx xop[]) { + // jump_over_one_insn_p may call extract on the next insn, clobbering + // recog_data.operand. Hence make a copy of the operands (PR116953). + rtx operands[] = { xop[0], xop[1], xop[2], xop[3] }; + rtx_code comp = GET_CODE (operands[0]); bool long_jump = get_attr_length (insn) >= 4; bool reverse = long_jump || jump_over_one_insn_p (insn, operands[3]); diff --git a/gcc/testsuite/gcc.target/avr/torture/pr116953.c b/gcc/testsuite/gcc.target/avr/torture/pr116953.c new file mode 100644 index 00000000000..f8e5a38ec65 --- /dev/null +++ b/gcc/testsuite/gcc.target/avr/torture/pr116953.c @@ -0,0 +1,7 @@ +unsigned foo (unsigned x, unsigned y) +{ + int i; + for (i = 8; i--; x <<= 1) + y ^= (x ^ y) & 0x80 ? 79U : 0U; + return y; +}