OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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
This commit is contained in:
Richard Guenther 2006-09-05 08:34:00 +00:00 committed by Richard Biener
parent 366f16226f
commit f393e7f57d
4 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -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

5
gcc/testsuite/ChangeLog
View File

@ -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.

15
gcc/testsuite/gcc.dg/pr28935.c Normal file
View File

@ -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;
}
}

12
gcc/tree-ssa-ccp.c
View File

@ -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;
}