re PR tree-optimization/28935 (Segfault in operand_equal_p with -ftree-vectorize...

2006-09-05  Richard Guenther  <rguenther@suse.de>

	PR middle-end/28935
	* tree-ssa-ccp.c (fold_stmt_r): Make sure to fold the condition
	of a COND_EXPR.

	* gcc.dg/pr28935.c: New testcase.

From-SVN: r116695

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c690c09f6ae9fccdad36f94671fb62bf5c658e38..b4490c4f8cf160f79d93e1cbe0e89294dffc8b9e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-05  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/28935
+       * tree-ssa-ccp.c (fold_stmt_r): Make sure to fold the condition
+       of a COND_EXPR.
+
 2006-09-04  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        PR rtl-optimization/27616

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a2b7e9cd9c8b67ec06c7f54a1f7c8a7143fb695b..1a4cda0f8c6b40f2134aa3385a9f7bb4849c7a0d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-05  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/28935
+       * gcc.dg/pr28935.c: New testcase.
+
 2006-09-05  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        * gcc.c-torture/execute/20060905-1.c: New test.

diff --git a/gcc/testsuite/gcc.dg/pr28935.c b/gcc/testsuite/gcc.dg/pr28935.c
new file mode 100644 (file)
index 0000000..9a0e70e
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr28935.c
@@ -0,0 +1,15 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -ftree-vectorize" } */
+
+int col[8];
+int extend_options(int w, int h, int *map, int x, int y, int index)
+{
+  int dx, dy;
+  for (dx = -1; dx <= +1; dx++)
+    {
+      int index = (dy < 0 ? 6-dx : dy > 0 ? 2+dx : 2*(1+dx));
+      if (x+dx >= 0 && x+dx < w && y+dy >= 0 && y+dy < h)
+        col[index] = map[(y+dy)*w+(x+dx)];
+      col[index] = -1;
+    }
+}

diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 53050e68429ab9a75177e209feb5487a542c41cd..8c31a861a8b88be1fa0293b120b59e7a9f653814 100644 (file)
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -2043,6 +2043,18 @@ fold_stmt_r (tree *expr_p, int *walk_subtrees, void *data)
       t = maybe_fold_tmr (expr);
       break;
 
+    case COND_EXPR:
+      if (COMPARISON_CLASS_P (TREE_OPERAND (expr, 0)))
+        {
+         tree op0 = TREE_OPERAND (expr, 0);
+          tree tem = fold_binary (TREE_CODE (op0), TREE_TYPE (op0),
+                                 TREE_OPERAND (op0, 0), TREE_OPERAND (op0, 1));
+         if (tem && is_gimple_condexpr (tem))
+           TREE_OPERAND (expr, 0) = tem;
+         t = expr;
+          break;
+        }
+
     default:
       return NULL_TREE;
     }