From patchwork Tue Oct 18 08:30:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 4008 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1840173wrs; Tue, 18 Oct 2022 01:31:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6q8qY+6Bwj6qeA+StJL1jKDbLSP171LhkbkkENQLcBzVML7UptjLf0ESWGMlFINcgo8gL+ X-Received: by 2002:a05:6402:f94:b0:459:42d7:ea9a with SMTP id eh20-20020a0564020f9400b0045942d7ea9amr1539645edb.392.1666081877921; Tue, 18 Oct 2022 01:31:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666081877; cv=none; d=google.com; s=arc-20160816; b=C5gnBnz5/qzzh16GDPX9ElxS8IhIttJ0F95k2t2l43g6/wJxMiN90hNwDOSjiBNloF KBerWHyZ8NcZT8aU6CCVvnRFEEZRmUBIKiajDcg0pfyHBQSyo5GAwJSrOykVmV7Oc108 aSS2OSU2Wl7SHtXUtt4ERgib5mmnZMH28v1CSGhIHYAZkGbpqB3qipe9wcjfXPrfAFLE y+1h+kUIuCk38XsKWieZ8mXL7eKjUGVfUUPw4wcfPLn+6qM/fL+wVrR14QzVAgU7P8j0 JMYmVQzRJe0f/+wZsErhhf+Xmmr2DlvS2cqDg1R1a8fMQnx2amfkLTQEVOg/0P3ZdaU2 5h7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:message-id :mime-version:subject:to:date:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=qL4qaICxWPhVP2OCmrzuobl0dFqVuhPTUewYDnRIIPw=; b=W7aixekDj2IzJmZwNeybp+CCS+0ByshHvP2fWn9aeQ3Qki/5zw+Iyvj8GgBJPSPQD+ OIbcX9N7SKF87DQ/B1h2WKKdhN6/l1ejxzj//gd0d4ccvaAqAoP6nY7/ZrpVGqJHKhAS YcTZivTmA68Ia0JMEkTzT+9fH86JNX7XZj4wl9zBDbmHWaOPxnBCgze2C8T4lLbUBFmF OkbQ7OsM8aJkAnGZhw3o6RPlOAQeFqcwBiGvZzvLZqsU55pmvAnqj5PwLw5tMTy8NO71 7c1FmJajGcyIYtsOf0ncK43RMZBFGspHgy6WQk6Ql52/UG/znopZZWyCHvFi/iqfvc/6 KVYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=iS9lweaY; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id j23-20020a508a97000000b0045ca3839229si11195635edj.274.2022.10.18.01.31.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 01:31:17 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=iS9lweaY; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 02A163858C50 for ; Tue, 18 Oct 2022 08:31:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 02A163858C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666081877; bh=qL4qaICxWPhVP2OCmrzuobl0dFqVuhPTUewYDnRIIPw=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=iS9lweaYv8mqOjs9Nk1Zj8KwpX/dztYm/7kaDevU/7RkTHEK1kCr1YNwAFmkewEHW BySHFho/LsGKUeRmWtBml5A1qDfoQKUzO7GQJXvR0nNnxX+HXSYpY0pLb8ZMBXzTG+ Ol/oRFo9P7etD2nmfG/QgpnJGfNnzZapKqH5QMeU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 9133E3858D3C for ; Tue, 18 Oct 2022 08:30:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9133E3858D3C Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 3EC4A20046 for ; Tue, 18 Oct 2022 08:30:22 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 2B11F139D2 for ; Tue, 18 Oct 2022 08:30:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id fohiCR5kTmP9ZQAAMHmgww (envelope-from ) for ; Tue, 18 Oct 2022 08:30:22 +0000 Date: Tue, 18 Oct 2022 10:30:21 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/107301 - check if we can duplicate block before doing so MIME-Version: 1.0 Message-Id: <20221018083022.2B11F139D2@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747013471302319068?= X-GMAIL-MSGID: =?utf-8?q?1747013471302319068?= Path isolation failed to do that. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/107301 * gimple-ssa-isolate-paths.cc (handle_return_addr_local_phi_arg): Check whether we can duplicate the block. (find_implicit_erroneous_behavior): Likewise. * gcc.dg/torture/pr107301.c: New testcase. --- gcc/gimple-ssa-isolate-paths.cc | 6 ++++-- gcc/testsuite/gcc.dg/torture/pr107301.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr107301.c diff --git a/gcc/gimple-ssa-isolate-paths.cc b/gcc/gimple-ssa-isolate-paths.cc index 87ecd19ef4a..e4a4e08f549 100644 --- a/gcc/gimple-ssa-isolate-paths.cc +++ b/gcc/gimple-ssa-isolate-paths.cc @@ -647,7 +647,8 @@ handle_return_addr_local_phi_arg (basic_block bb, basic_block duplicate, if (!maybe && (flag_isolate_erroneous_paths_dereference || flag_isolate_erroneous_paths_attribute) - && gimple_bb (use_stmt) == bb) + && gimple_bb (use_stmt) == bb + && (duplicate || can_duplicate_block_p (bb))) { duplicate = isolate_path (bb, duplicate, e, use_stmt, lhs, true); @@ -765,7 +766,8 @@ find_implicit_erroneous_behavior (void) ? gimple_location (use_stmt) : phi_arg_loc; - if (stmt_uses_name_in_undefined_way (use_stmt, lhs, loc)) + if (stmt_uses_name_in_undefined_way (use_stmt, lhs, loc) + && (duplicate || can_duplicate_block_p (bb))) { duplicate = isolate_path (bb, duplicate, e, use_stmt, lhs, false); diff --git a/gcc/testsuite/gcc.dg/torture/pr107301.c b/gcc/testsuite/gcc.dg/torture/pr107301.c new file mode 100644 index 00000000000..5f0afcc0d10 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr107301.c @@ -0,0 +1,15 @@ +/* { dg-do compile } */ + +__attribute__ ((pure, returns_twice)) int +foo (int x) +{ + int a; + + a = x ? 3 : 0; + x /= a; + a = foo (x); + if (x == a) + __builtin_unreachable (); + + return 0; +}