From d3079c44fc5087b8e6f39379062a4b50e42bf49d Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 5 Sep 2007 01:29:58 +0200
Subject: [PATCH] re PR tree-optimization/33017 (tree check fail for legal
code)
PR tree-optimization/33017
* tree-data-ref.c (split_constant_offset) <case SSA_NAME>: Don't
recurse for pure or const function calls.
* gcc.dg/pr33017.c: New test.
From-SVN: r128107
---
gcc/ChangeLog | 4 ++++
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/gcc.dg/pr33017.c | 30 ++++++++++++++++++++++++++++++
gcc/tree-data-ref.c | 3 ++-
4 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gcc.dg/pr33017.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8cbaeaa3d923..7f83513aeb5b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,10 @@
* config/rs6000/tramp.asm: Include config.h.
Check __PIC__ or __pic__ macro instead of SHARED.
+ PR tree-optimization/33017
+ * tree-data-ref.c (split_constant_offset) <case SSA_NAME>: Don't
+ recurse for pure or const function calls.
+
2007-09-04 Laurynas Biveinis <laurynas.biveinis@gmail.com>
* c-format.c: Include alloc-pool.h.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b68ba679f745..b191442349e6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-05 Jakub Jelinek <jakub@redhat.com>
+
+ PR tree-optimization/33017
+ * gcc.dg/pr33017.c: New test.
+
2007-09-05 Ben Elliston <bje@au.ibm.com>
* gcc.target/powerpc/ppu-intrinsics.c: Add test cases for the
diff --git a/gcc/testsuite/gcc.dg/pr33017.c b/gcc/testsuite/gcc.dg/pr33017.c
new file mode 100644
index 000000000000..851fe71f8607
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr33017.c
@@ -0,0 +1,30 @@
+/* PR tree-optimization/33017 */
+/* { dg-do run } */
+/* { dg-options "-O2 -ftree-vectorize" } */
+
+extern __SIZE_TYPE__ strlen (const char *);
+extern void abort (void);
+
+char *
+__attribute__((noinline))
+foo (const char *string)
+{
+ int len;
+ static char var[0x104];
+ int off;
+ len = strlen (string);
+ for (off = 0; off < 64; off++)
+ var[len + off + 2] = 0x57;
+ return var;
+}
+
+int
+main (void)
+{
+ char *p = foo ("abcd");
+ int i;
+ for (i = 0; i < 0x104; i++)
+ if (p[i] != ((i >= 6 && i < 70) ? 0x57 : 0))
+ abort ();
+ return 0;
+}
diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index 6ad2e96bea53..720c94d59981 100644
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -574,7 +574,8 @@ split_constant_offset (tree exp, tree *var, tree *off)
if (!TREE_SIDE_EFFECTS (def_stmt_rhs)
&& EXPR_P (def_stmt_rhs)
- && !REFERENCE_CLASS_P (def_stmt_rhs))
+ && !REFERENCE_CLASS_P (def_stmt_rhs)
+ && !get_call_expr_in (def_stmt_rhs))
{
split_constant_offset (def_stmt_rhs, &var0, &off0);
var0 = fold_convert (type, var0);
--
GitLab