From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id C57273858C50 for ; Thu, 17 Aug 2023 13:26:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C57273858C50 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id BC550211B7 for ; Thu, 17 Aug 2023 13:26:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692278811; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=fvOzDYmW3aoPsGdkqOwWUZPHxEYLvdateLeTZguGYDo=; b=PdpIpkuql5qRJAuVI0NpL+4cY+KE5mgUSUCiYazwmQ7Ti/rpT4ivTnhJwNogjjGUmJosei 34/99GJNiu+YoGh8H2ZGgavzNFIQkCIB8FOm/iRwgqcNpXRLoVFF0uUxeIazXrbUs2hAuJ kwD89LL3KcHPfCf+Th/+NEljtaHHs2g= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692278811; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=fvOzDYmW3aoPsGdkqOwWUZPHxEYLvdateLeTZguGYDo=; b=fIy0AxliHocIJR+veOYaOEgAX9/TlnFbKI+0HKLZ3APd+Y8RcybpMwNdDVr1bjSfTAI/JZ UcIWtL6HdxLjrJCQ== 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 B0A552C146 for ; Thu, 17 Aug 2023 13:26:51 +0000 (UTC) Date: Thu, 17 Aug 2023 13:26:51 +0000 (UTC) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/111039 - abnormals and bit test merging User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII 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 List-Id: Message-ID: <20230817132651.j0aKPx0vDGm4zRU7zgZYYKTx5LqS4pyVKvUbkOVLFsk@z> The following guards the bit test merging code in if-combine against the appearance of SSA names used in abnormal PHIs. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/111039 * tree-ssa-ifcombine.cc (ifcombine_ifandif): Check for SSA_NAME_OCCURS_IN_ABNORMAL_PHI. * gcc.dg/pr111039.c: New testcase. --- gcc/testsuite/gcc.dg/pr111039.c | 15 +++++++++++++++ gcc/tree-ssa-ifcombine.cc | 7 +++++++ 2 files changed, 22 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr111039.c diff --git a/gcc/testsuite/gcc.dg/pr111039.c b/gcc/testsuite/gcc.dg/pr111039.c new file mode 100644 index 00000000000..bec9983b35f --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr111039.c @@ -0,0 +1,15 @@ +/* { dg-do compile } */ +/* { dg-options "-O" } */ + +int _setjmp (); +void abcd (); +void abcde (); +void compiler_corruption_function(int flags) +{ + int nowait = flags & 1048576, isexpand = flags & 8388608; + abcd(); + _setjmp(flags); + if (nowait && isexpand) + flags &= 0; + abcde(); +} diff --git a/gcc/tree-ssa-ifcombine.cc b/gcc/tree-ssa-ifcombine.cc index 58e19c1508e..d5701e8c407 100644 --- a/gcc/tree-ssa-ifcombine.cc +++ b/gcc/tree-ssa-ifcombine.cc @@ -430,6 +430,9 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv, { tree t, t2; + if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)) + return false; + /* Do it. */ gsi = gsi_for_stmt (inner_cond); t = fold_build2 (LSHIFT_EXPR, TREE_TYPE (name1), @@ -486,6 +489,10 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv, gimple_stmt_iterator gsi; tree t; + if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1) + || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2)) + return false; + /* Find the common name which is bit-tested. */ if (name1 == name2) ; -- 2.35.3