From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id EEF8C38A815A for ; Mon, 20 Feb 2023 10:10:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EEF8C38A815A 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-out2.suse.de (Postfix) with ESMTP id 0C7D91F896 for ; Mon, 20 Feb 2023 07:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1676878994; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=yTMiIzLTC79oqUciqu3bWTRUzxfGbYbXO7s9eJ227z4=; b=UBOT7UcxReEPRc1V+WJwQkmrEVOYuIoFRkfL5bnmMTtqDHwsQPfBOsbgKc9FHxR5gA7gZI jbo3+6Cl0dUTUVS+RbCXEREhdESYS+Pe9akzoz3+piEfz5cWqCpoK8z7XPWs+NCdgM0IMD oxjXPbLD97cvqK2U76DGuyHkXmnZVU8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1676878994; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=yTMiIzLTC79oqUciqu3bWTRUzxfGbYbXO7s9eJ227z4=; b=GwnaLY2E8xtuTVIc/qd1afTWZAGi7K317eBB5r/4h6LdsS3lr2+a8f75bN0JtD7HmVkK7c B4IbvNabDa3te2AQ== 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 01A772C141 for ; Mon, 20 Feb 2023 07:43:13 +0000 (UTC) Date: Mon, 20 Feb 2023 07:43:13 +0000 (UTC) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/108819 - niter analysis ICE with unexpected constant 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=unavailable 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: <20230220074313.1rreMlFzzuUufOaRGuL3pSPa1rRLgVLtbJ1-tdqnETU@z> The following makes sure we do not ICE on unfolded stmts like _1 = 1 & 1. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/108819 * tree-ssa-loop-niter.cc (number_of_iterations_cltz): Check we have an SSA name as iv_2 as expected. * gcc.dg/pr108819.c: New testcase. --- gcc/testsuite/gcc.dg/pr108819.c | 14 ++++++++++++++ gcc/tree-ssa-loop-niter.cc | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr108819.c diff --git a/gcc/testsuite/gcc.dg/pr108819.c b/gcc/testsuite/gcc.dg/pr108819.c new file mode 100644 index 00000000000..a651f819908 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr108819.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-O -fno-tree-ccp -fno-tree-forwprop" } */ + +int a, b; +int main() { + int d = 1; + for (; b; b++) + if (a < 1) + while (d <= a && a <= 0UL) { + int *e = &d; + *e = 0; + } + return 0; +} diff --git a/gcc/tree-ssa-loop-niter.cc b/gcc/tree-ssa-loop-niter.cc index 581bf5d067b..1ce5e736ce3 100644 --- a/gcc/tree-ssa-loop-niter.cc +++ b/gcc/tree-ssa-loop-niter.cc @@ -2354,7 +2354,8 @@ number_of_iterations_cltz (loop_p loop, edge exit, gimple *and_stmt = SSA_NAME_DEF_STMT (gimple_cond_lhs (cond_stmt)); if (!is_gimple_assign (and_stmt) || gimple_assign_rhs_code (and_stmt) != BIT_AND_EXPR - || !integer_pow2p (gimple_assign_rhs2 (and_stmt))) + || !integer_pow2p (gimple_assign_rhs2 (and_stmt)) + || TREE_CODE (gimple_assign_rhs1 (and_stmt)) != SSA_NAME) return false; checked_bit = tree_log2 (gimple_assign_rhs2 (and_stmt)); @@ -2382,7 +2383,8 @@ number_of_iterations_cltz (loop_p loop, edge exit, precision. */ iv_2 = gimple_assign_rhs1 (test_value_stmt); tree rhs_type = TREE_TYPE (iv_2); - if (TREE_CODE (rhs_type) != INTEGER_TYPE + if (TREE_CODE (iv_2) != SSA_NAME + || TREE_CODE (rhs_type) != INTEGER_TYPE || (TYPE_PRECISION (rhs_type) != TYPE_PRECISION (test_value_type))) return false; -- 2.35.3