From patchwork Mon Nov 28 07:59:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 61141 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 BB0AF3858414 for ; Mon, 28 Nov 2022 08:00:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB0AF3858414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669622412; bh=NVfS5LgX7s3Mds8deM320oRCJVEY/RC+RDPhzG4v+Ss=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Jek/7FcNMFRUlGGbqCbHTh7Mzs2i5xnjMOMo+Msiwna5/57dt4z30QRG7piHP/YwA iQEgg3qOgBTar2BP9atwUrpux1e61Ucu1+x7RlqyOGzTYaXq1BQIpUK69LCM4w2f+F 90pdIfD6b5uqSfvJcWnyXPZU7tChzLDJ8U/OL31k= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 6B08F3858CDB for ; Mon, 28 Nov 2022 07:59:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6B08F3858CDB 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-out1.suse.de (Postfix) with ESMTPS id 3675C21A54 for ; Mon, 28 Nov 2022 07:59:44 +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 239B11326E for ; Mon, 28 Nov 2022 07:59:44 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id /ctxB3BqhGN6TwAAMHmgww (envelope-from ) for ; Mon, 28 Nov 2022 07:59:44 +0000 Date: Mon, 28 Nov 2022 08:59:43 +0100 (CET) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/107867 - failed abnormal cleanup in forwprop MIME-Version: 1.0 Message-Id: <20221128075944.239B11326E@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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The following makes sure to perform abnormal cleanup when forwprop propagates into a call. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/107867 * tree-ssa-forwprop.cc (pass_forwprop::execute): Handle abnormal cleanup after substitution. * g++.dg/pr107867.C: New testcase. --- gcc/testsuite/g++.dg/pr107867.C | 19 +++++++++++++++++++ gcc/tree-ssa-forwprop.cc | 10 ++++++++++ 2 files changed, 29 insertions(+) create mode 100644 gcc/testsuite/g++.dg/pr107867.C diff --git a/gcc/testsuite/g++.dg/pr107867.C b/gcc/testsuite/g++.dg/pr107867.C new file mode 100644 index 00000000000..16c7499cf7b --- /dev/null +++ b/gcc/testsuite/g++.dg/pr107867.C @@ -0,0 +1,19 @@ +// { dg-do compile } +// { dg-options "-Os -fno-tree-ccp -Wuninitialized" } + +void printf(...); +void __sigsetjmp_cancel() __attribute__((__returns_twice__)); +int z, main_ret; +void func(void *) {} + +int +main() +{ + int x; + void (*__cancel_routine)(void *)(func); + __sigsetjmp_cancel(); + __cancel_routine(0); + if (main_ret) + x = z; + printf(x); +} diff --git a/gcc/tree-ssa-forwprop.cc b/gcc/tree-ssa-forwprop.cc index 429f77f199c..160e49e097e 100644 --- a/gcc/tree-ssa-forwprop.cc +++ b/gcc/tree-ssa-forwprop.cc @@ -3367,6 +3367,7 @@ pass_forwprop::execute (function *fun) auto_vec to_fixup; auto_vec to_remove; to_purge = BITMAP_ALLOC (NULL); + bitmap need_ab_cleanup = BITMAP_ALLOC (NULL); for (int i = 0; i < postorder_num; ++i) { gimple_stmt_iterator gsi; @@ -3682,6 +3683,9 @@ pass_forwprop::execute (function *fun) /* Mark stmt as potentially needing revisiting. */ gimple_set_plf (stmt, GF_PLF_1, false); + bool can_make_abnormal_goto = (is_gimple_call (stmt) + && stmt_can_make_abnormal_goto (stmt)); + /* Substitute from our lattice. We need to do so only once. */ bool substituted_p = false; use_operand_p usep; @@ -3700,6 +3704,10 @@ pass_forwprop::execute (function *fun) && is_gimple_assign (stmt) && gimple_assign_rhs_code (stmt) == ADDR_EXPR) recompute_tree_invariant_for_addr_expr (gimple_assign_rhs1 (stmt)); + if (substituted_p + && can_make_abnormal_goto + && !stmt_can_make_abnormal_goto (stmt)) + bitmap_set_bit (need_ab_cleanup, bb->index); bool changed; do @@ -3901,7 +3909,9 @@ pass_forwprop::execute (function *fun) } cfg_changed |= gimple_purge_all_dead_eh_edges (to_purge); + cfg_changed |= gimple_purge_all_dead_abnormal_call_edges (need_ab_cleanup); BITMAP_FREE (to_purge); + BITMAP_FREE (need_ab_cleanup); if (cfg_changed) todoflags |= TODO_cleanup_cfg;