diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/lambda-code.c | 13 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-ssa/pr34017.c | 26 |
4 files changed, 46 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9f03fe3696b..0748d1575a2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-01-09 Sebastian Pop <sebastian.pop@amd.com> + + PR tree-optimization/34017 + * lambda-code.c (lambda_loopnest_to_gcc_loopnest): Generate code + also for PHI_NODE expressions. + 2008-01-09 Jan Hubicka <jh@suse.cz> PR tree-optimization/34708 diff --git a/gcc/lambda-code.c b/gcc/lambda-code.c index 45f31b1a263..0b67231a58d 100644 --- a/gcc/lambda-code.c +++ b/gcc/lambda-code.c @@ -1675,7 +1675,6 @@ remove_iv (tree iv_stmt) } } - /* Transform a lambda loopnest NEW_LOOPNEST, which had TRANSFORM applied to it, back into gcc code. This changes the loops, their induction variables, and their bodies, so that they @@ -1699,6 +1698,7 @@ lambda_loopnest_to_gcc_loopnest (struct loop *old_loopnest, { struct loop *temp; size_t i = 0; + int j; size_t depth = 0; VEC(tree,heap) *new_ivs = NULL; tree oldiv; @@ -1837,8 +1837,6 @@ lambda_loopnest_to_gcc_loopnest (struct loop *old_loopnest, tree newiv, stmts; lambda_body_vector lbv, newlbv; - gcc_assert (TREE_CODE (stmt) != PHI_NODE); - /* Compute the new expression for the induction variable. */ depth = VEC_length (tree, new_ivs); @@ -1850,7 +1848,8 @@ lambda_loopnest_to_gcc_loopnest (struct loop *old_loopnest, newiv = lbv_to_gcc_expression (newlbv, TREE_TYPE (oldiv), new_ivs, &stmts); - if (stmts) + + if (stmts && TREE_CODE (stmt) != PHI_NODE) { bsi = bsi_for_stmt (stmt); bsi_insert_before (&bsi, stmts, BSI_SAME_STMT); @@ -1858,6 +1857,12 @@ lambda_loopnest_to_gcc_loopnest (struct loop *old_loopnest, FOR_EACH_IMM_USE_ON_STMT (use_p, imm_iter) propagate_value (use_p, newiv); + + if (stmts && TREE_CODE (stmt) == PHI_NODE) + for (j = 0; j < PHI_NUM_ARGS (stmt); j++) + if (PHI_ARG_DEF (stmt, j) == newiv) + bsi_insert_on_edge (PHI_ARG_EDGE (stmt, j), stmts); + update_stmt (stmt); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3201f9e5051..8730974a7a7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-01-09 Sebastian Pop <sebastian.pop@amd.com> + + PR tree-optimization/34017 + * gcc.dg/tree-ssa/pr34017.c: New. + 2008-01-09 Richard Guenther <rguenther@suse.de> Andrew Pinski <andrew_pinski@playstation.sony.com> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr34017.c b/gcc/testsuite/gcc.dg/tree-ssa/pr34017.c new file mode 100644 index 00000000000..ee279b7c8df --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr34017.c @@ -0,0 +1,26 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -ftree-loop-linear" } */ + +extern int s; + +void +foo (int *x, int y, int z) +{ + int m, n; + int o; + int p = x[0]; + o = s; + for (m = 0; m < s; m++) + for (n = 0; n < s; n++) + { + if (x[n] != p) + continue; + if (m > z) + z = m; + if (n < o) + o = n; + } + for (m = y; m <= z; m++) + { + } +} |