diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr28935.c | 15 | ||||
| -rw-r--r-- | gcc/tree-ssa-ccp.c | 12 |
4 files changed, 38 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c690c09..b4490c4 100644 --- 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 a2b7e9c..1a4cda0 100644 --- 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 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 53050e6..8c31a86 100644 --- 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; } |