From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1011) id 2F3AC3858D28; Mon, 25 Apr 2022 13:59:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2F3AC3858D28 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Andrew Macleod To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-8246] Retain existing range knowledge when prefilling statements. X-Act-Checkin: gcc X-Git-Author: Andrew MacLeod X-Git-Refname: refs/heads/master X-Git-Oldrev: 46cd445fc0714cc6c834b680c3f59dbad0b94a3c X-Git-Newrev: 362e2a9c6297203bcf7f66bfb51dffb82b42d3b3 Message-Id: <20220425135924.2F3AC3858D28@sourceware.org> Date: Mon, 25 Apr 2022 13:59:24 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2022 13:59:24 -0000 https://gcc.gnu.org/g:362e2a9c6297203bcf7f66bfb51dffb82b42d3b3 commit r12-8246-g362e2a9c6297203bcf7f66bfb51dffb82b42d3b3 Author: Andrew MacLeod Date: Mon Apr 25 09:56:35 2022 -0400 Retain existing range knowledge when prefilling statements. When range_of_stmt was adjusted to avoid large recursion depth, we need to intersect the calculated range whth the any known range to avoid losing info. Range_of_stmt does this, but the new prefill code missed it. PR tree-optimization/105276 gcc/ * gimple-range.cc (gimple_ranger::prefill_stmt_dependencies): Include existing global range with calculated value. gcc/testsuite/ * g++.dg/pr105276.C: New. Diff: --- gcc/gimple-range.cc | 4 ++++ gcc/testsuite/g++.dg/pr105276.C | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/gcc/gimple-range.cc b/gcc/gimple-range.cc index 04075a98a80..f0caefce2a3 100644 --- a/gcc/gimple-range.cc +++ b/gcc/gimple-range.cc @@ -394,6 +394,10 @@ gimple_ranger::prefill_stmt_dependencies (tree ssa) // Fold and save the value for NAME. stmt = SSA_NAME_DEF_STMT (name); fold_range_internal (r, stmt, name); + // Make sure we don't lose any current global info. + int_range_max tmp; + m_cache.get_global_range (tmp, name); + r.intersect (tmp); m_cache.set_global_range (name, r); } continue; diff --git a/gcc/testsuite/g++.dg/pr105276.C b/gcc/testsuite/g++.dg/pr105276.C new file mode 100644 index 00000000000..ad0e9dd7e09 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr105276.C @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +bool +foo(unsigned i) +{ + bool result = true; + while (i) + { + i = i % 3; + i = i - (i == 2 ? 2 : i ? 1 : 0); + result = !result; + } + return result; +} + +/* We should be able to eliminate the i - operation. */ +/* { dg-final { scan-tree-dump-not "i_.* - " "optimized" } } */