From patchwork Wed Mar 29 11:55:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 76537 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp352781vqo; Wed, 29 Mar 2023 04:56:37 -0700 (PDT) X-Google-Smtp-Source: AKy350ZtQuJdTMz1jt+iZ61C0CivNtmLBsmpZj7gJDCnENimFoZswuIotOCIHDvEPq27I7zHnk0G X-Received: by 2002:a17:906:6897:b0:931:75f5:36db with SMTP id n23-20020a170906689700b0093175f536dbmr18900219ejr.11.1680090997141; Wed, 29 Mar 2023 04:56:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680090997; cv=none; d=google.com; s=arc-20160816; b=zV8ZxoZXVjiPEfpbPRUQMykvRy6QWEzROoCd7FM71oSPIdv5x6HeK8HBOXZzZOdB/s 6uITbvNaSsHxNeXWnuHwbovxb780XTjbfyiaUIGIx5iLrRB8FB8Fzzfg3fwn5rqcKC+w L+3KpIcaAPlHZeDruMf3n8cd2EbbFbiFNlkPpNMMPG+t7apRhz0emYyK70nsHMPQm/rk lQSPgRhXie6zLDaly4IFBrd253ttKNs0FsynJ0cSPgiRS6T5Hhxm/G7Dj9fBVNErIVOE aOvvbSdBF2I+asWvWIo6qZeICaWwO4EJvuQHs0u+/vJ3LAc2nAscjXtwM1g1+TBrFl0X mj1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:sender:errors-to:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :mime-version:user-agent:subject:to:date:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=91SFbYVlELxCJepYfBkGIbSNlYO2pPu+VwC/Qrp4ukw=; b=pOywFt9ozjuF0hU8qOvimbHbgm8eJVv6q5iluyOYuYSMzYwdHJG3FszI622Eo7RaP8 i8v1Bv9gH0yHiPuNZzOM1AhayCMXTUH8CV4kJuIJQ1C/0EsF72nGJQGISP63ZFrymaEN I2thTY4sfDSeF8xhqPa/dEOoLp5IA9AlBYklJ47+jyHH+23de08aj8mbkfSIoyalcwbU 9gWZ8a0Q1MM4dp+4n/DPIza7uesy7Lh8VdjpZsQelpbnVhSQt8brXJKOYQZer0r9P18s 0bo9o2lw22oOg+izhrB19FK9bntx20d1RxjKQTlvAUlU3R39HA9w6fwvWYJEDRu2UjXU fTrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=CjiGnHtC; 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 so8-20020a170907390800b0093a0e9767f7si23007959ejc.646.2023.03.29.04.56.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 04:56:37 -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=CjiGnHtC; 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 6D3113858434 for ; Wed, 29 Mar 2023 11:56:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6D3113858434 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680090995; bh=91SFbYVlELxCJepYfBkGIbSNlYO2pPu+VwC/Qrp4ukw=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=CjiGnHtC33MpHGON2WbELqcQprhuO4T9GILuAECNJp5R/zvAJTrMJdfBzcT+NzVbC SRtelNs5AtwePEirpHifbDb96cp6IjBNpyib2tX3O2zP3vDWzIjYFbKpE3MMdqRnnv MPnoWcCaIM1u4VwUyiDqb09YfsucFo9+AO4Y9dEY= 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 BE0903858D1E for ; Wed, 29 Mar 2023 11:55:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BE0903858D1E Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id BD7DC1FDD0 for ; Wed, 29 Mar 2023 11:55:50 +0000 (UTC) Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id A937E2C141 for ; Wed, 29 Mar 2023 11:55:50 +0000 (UTC) Date: Wed, 29 Mar 2023 11:55:50 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/109331 - make sure to clean up the CFG after forwprop User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, 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" Message-Id: <20230329115635.6D3113858434@sourceware.org> X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761703097435168283?= X-GMAIL-MSGID: =?utf-8?q?1761703097435168283?= When forwprop discovers unreachable code or makes decisions based on unreachable edges make sure to cleanup the CFG since otherwise SSA form can become invalid. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/109331 * tree-ssa-forwprop.cc (pass_forwprop::execute): When we discover a taken edge make sure to cleanup the CFG. * gcc.dg/torture/pr109331.c: New testcase. --- gcc/testsuite/gcc.dg/torture/pr109331.c | 16 ++++++++++++++++ gcc/tree-ssa-forwprop.cc | 6 +++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr109331.c diff --git a/gcc/testsuite/gcc.dg/torture/pr109331.c b/gcc/testsuite/gcc.dg/torture/pr109331.c new file mode 100644 index 00000000000..72c57b9b74c --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr109331.c @@ -0,0 +1,16 @@ +/* { dg-do compile } */ + +char *ustol_dpp; +void ustol(int flags) +{ + char *s; + if (s) + flags |= 3; + switch (flags & 3) + case 3: + while (*s) + case '+': + ++s; + if (flags) + ustol_dpp = s; +} diff --git a/gcc/tree-ssa-forwprop.cc b/gcc/tree-ssa-forwprop.cc index bb0fa306312..9b567440ba4 100644 --- a/gcc/tree-ssa-forwprop.cc +++ b/gcc/tree-ssa-forwprop.cc @@ -4046,7 +4046,11 @@ pass_forwprop::execute (function *fun) /* Mark outgoing exectuable edges. */ if (edge e = find_taken_edge (bb, NULL)) - e->flags |= EDGE_EXECUTABLE; + { + e->flags |= EDGE_EXECUTABLE; + if (EDGE_COUNT (bb->succs) > 1) + cfg_changed = true; + } else { FOR_EACH_EDGE (e, ei, bb->succs)