From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <amacleod@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1011)
	id D22493858C52; Fri,  3 Feb 2023 19:43:13 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D22493858C52
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1675453393;
	bh=lIoWXsQXXpklmrjHNTqD4TSyKmyKOOqvNkiqyqW9qDY=;
	h=From:To:Subject:Date:From;
	b=lMPnmhcXsvFEYtjh6z64+uN1NjJR9Mbkz7UmQ9S3laqh8V6cLTrJnO+SmTvpJh1ZB
	 L0MS7yhbiPul35feetP3RxmcuFk2rm2pZWfpcT1nXmudXLqp7WPmo1Z/pwDfDZwhpQ
	 SBo9TmngH9iVLmoonSKKg5qM8ku66KKph/7RAKE4=
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Andrew Macleod <amacleod@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-5694] Reset SCEV before removing unreachable globals.
X-Act-Checkin: gcc
X-Git-Author: Andrew MacLeod <amacleod@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 27ac6a707e7438c3cec79c24f5d53de79493e2f8
X-Git-Newrev: 093e2e1b201c0f324e0d8bfe6487aa2d470a13e7
Message-Id: <20230203194313.D22493858C52@sourceware.org>
Date: Fri,  3 Feb 2023 19:43:13 +0000 (GMT)
List-Id: <gcc-cvs.sourceware.org>

https://gcc.gnu.org/g:093e2e1b201c0f324e0d8bfe6487aa2d470a13e7

commit r13-5694-g093e2e1b201c0f324e0d8bfe6487aa2d470a13e7
Author: Andrew MacLeod <amacleod@redhat.com>
Date:   Wed Feb 1 11:46:18 2023 -0500

    Reset SCEV before removing unreachable globals.
    
    SCEV should be reset in VRP before trying to remove unreachable globals
    to avoid triggering issues with it's cache.
    
            PR tree-optimization/107570
            gcc/
            * tree-vrp.cc (remove_and_update_globals): Reset SCEV.
    
            gcc/testsuite/
            * gcc.dg/pr107570.c: New.

Diff:
---
 gcc/testsuite/gcc.dg/pr107570.c | 25 +++++++++++++++++++++++++
 gcc/tree-vrp.cc                 |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/gcc/testsuite/gcc.dg/pr107570.c b/gcc/testsuite/gcc.dg/pr107570.c
new file mode 100644
index 00000000000..ba5b535a867
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr107570.c
@@ -0,0 +1,25 @@
+/* { dg-do compile } */
+/* { dg-options "-Os" } */
+
+long int n;
+
+void
+foo (int *p, int x)
+{
+  for (;;)
+    {
+      for (*p = 0; *p < 1; ++*p)
+        {
+          n += *p < 0;
+          if (n < x)
+            {
+              while (x < 1)
+                ++x;
+
+              __builtin_unreachable ();
+            }
+        }
+
+      p = &x;
+    }
+}
diff --git a/gcc/tree-vrp.cc b/gcc/tree-vrp.cc
index 3c431760a16..95547e5419b 100644
--- a/gcc/tree-vrp.cc
+++ b/gcc/tree-vrp.cc
@@ -121,6 +121,10 @@ remove_unreachable::remove_and_update_globals (bool final_p)
   if (m_list.length () == 0)
     return false;
 
+  // Ensure the cache in SCEV has been cleared before processing
+  // globals to be removed.
+  scev_reset ();
+
   bool change = false;
   tree name;
   unsigned i;