tree-optimization/115137 - more ptr-vs-ptr compare fixes

Message ID 20240521095959.38BFF13A21@imap1.dmz-prg2.suse.org
State Committed
Commit 85f7828679edc3ae7488594145756cd53787650e
Headers
Series tree-optimization/115137 - more ptr-vs-ptr compare fixes |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 warning Patch is already merged
linaro-tcwg-bot/tcwg_gcc_build--master-arm warning Patch is already merged

Commit Message

Richard Biener May 21, 2024, 9:59 a.m. UTC
  The following fixes the omission of const-pool included in NONLOCAL.

Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed.

	PR tree-optimization/115137
	* tree-ssa-structalias.cc (pt_solution_includes_const_pool): NONLOCAL
	also includes constant pool entries.

	* gcc.dg/torture/pr115137.c: New testcase.
---
 gcc/testsuite/gcc.dg/torture/pr115137.c | 34 +++++++++++++++++++++++++
 gcc/tree-ssa-structalias.cc             |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 gcc/testsuite/gcc.dg/torture/pr115137.c
  

Patch

diff --git a/gcc/testsuite/gcc.dg/torture/pr115137.c b/gcc/testsuite/gcc.dg/torture/pr115137.c
new file mode 100644
index 00000000000..9cd8ff93633
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr115137.c
@@ -0,0 +1,34 @@ 
+/* { dg-do run } */
+
+struct a {
+  int b;
+} c;
+
+int d;
+long e;
+
+static void f(char *g, char *h, struct a *l) {
+  char a[1024];
+  int j = 0;
+
+  if (d)
+    h = a;
+
+  for (; g < h; g++)
+    if (__builtin_iscntrl(*g))
+      ++j;
+
+  while (l->b < j)
+    ;
+}
+
+int main() {
+  static const struct {
+    char *input;
+  } k[] = {{"somepage.html"}, {""}};
+
+  for (unsigned int i = 0; i < 1; ++i) {
+    e = __builtin_strlen(k[i].input);
+    f(k[i].input, k[i].input + e, &c);
+  }
+}
diff --git a/gcc/tree-ssa-structalias.cc b/gcc/tree-ssa-structalias.cc
index 61fb3610a17..0e9423a78ec 100644
--- a/gcc/tree-ssa-structalias.cc
+++ b/gcc/tree-ssa-structalias.cc
@@ -7087,6 +7087,7 @@  bool
 pt_solution_includes_const_pool (struct pt_solution *pt)
 {
   return (pt->const_pool
+	  || pt->nonlocal
 	  || (pt->escaped && (!cfun || cfun->gimple_df->escaped.const_pool))
 	  || (pt->ipa_escaped && ipa_escaped_pt.const_pool));
 }