From 1dff453d7b77b6b12ef93ab80e2016e5dbab637d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 20 Oct 2010 23:15:49 +0200 Subject: [PATCH] re PR tree-optimization/46066 (ICE: in create_parallel_loop, at tree-parloops.c:1455 with -ftree-parallelize-loops -g) PR tree-optimization/46066 * tree-parloops.c (create_parallel_loop): Use gsi_last_nondebug_bb instead of gsi_last_bb. * gcc.dg/autopar/pr46066.c: New test. From-SVN: r165739 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 11 ++++++++--- gcc/testsuite/gcc.dg/autopar/pr46066.c | 18 ++++++++++++++++++ gcc/tree-parloops.c | 2 +- 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/autopar/pr46066.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7a67b096add..352be15761a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-10-20 Jakub Jelinek + + PR tree-optimization/46066 + * tree-parloops.c (create_parallel_loop): Use gsi_last_nondebug_bb + instead of gsi_last_bb. + 2010-10-20 DJ Delorie * config/m32c/m32c.c (m32c_option_override): Always disable diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9d9c5437c43..665f8a5df4a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,9 +1,14 @@ +2010-10-20 Jakub Jelinek + + PR tree-optimization/46066 + * gcc.dg/autopar/pr46066.c: New test. + 2010-10-20 Rainer Orth PR c++/46024 * g++.dg/warn/miss-format-1.C: Enclose dg-error target list in braces. -2010-10-20 Rodrigo Rivas Costa +2010-10-20 Rodrigo Rivas Costa PR c++/46056 * g++.dg/cpp0x/range-for7.C: New. @@ -1900,7 +1905,7 @@ * gfortran.dg/promotion.f90: Fix options. -2010-09-11 Rodrigo Rivas +2010-09-11 Rodrigo Rivas * g++.dg/cpp0x/range-for1.C: New. * g++.dg/cpp0x/range-for2.C: New. @@ -1915,7 +1920,7 @@ and counts. Check that transpose is not called. * gfortran.dg/transpose_2.f90: Update error message. -2010-09-10 Rodrigo Rivas Costa +2010-09-10 Rodrigo Rivas Costa PR c++/43824 * g++.dg/lookup/strong-using-1.C: Set dg-options to "". diff --git a/gcc/testsuite/gcc.dg/autopar/pr46066.c b/gcc/testsuite/gcc.dg/autopar/pr46066.c new file mode 100644 index 00000000000..e9bf6c59e31 --- /dev/null +++ b/gcc/testsuite/gcc.dg/autopar/pr46066.c @@ -0,0 +1,18 @@ +/* PR tree-optimization/46066 */ +/* { dg-do compile } */ +/* { dg-options "-fcompare-debug -O -ftree-parallelize-loops=4" } */ + +void +parloop (int N) +{ + int i, j, ii; + int x[400][10][400]; + for (ii = 0; ii < N; ii++) + for (i = 0; i < N; i++) + for (j = 0; j < N; j++) + x[i][j][ii] = 3; + for (i = 0; i < N; i++) + for (j = 0; j < N; j++) + if (x[i][j][0] != 3) + __builtin_abort (); +} diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c index 4fc67a3adc9..b25b2082922 100644 --- a/gcc/tree-parloops.c +++ b/gcc/tree-parloops.c @@ -1451,7 +1451,7 @@ create_parallel_loop (struct loop *loop, tree loop_fn, tree data, initvar); cvar_next = PHI_ARG_DEF_FROM_EDGE (phi, loop_latch_edge (loop)); - gsi = gsi_last_bb (loop->latch); + gsi = gsi_last_nondebug_bb (loop->latch); gcc_assert (gsi_stmt (gsi) == SSA_NAME_DEF_STMT (cvar_next)); gsi_remove (&gsi, true); -- 2.30.2