From 4e8d71770098bd2fc4ddf78c68fa72a2df205308 Mon Sep 17 00:00:00 2001 From: Sebastian Pop Date: Wed, 21 May 2008 23:13:00 +0000 Subject: [PATCH] re PR middle-end/36286 (ICE with -ftree-loop-linear and -O1 and above) 2008-05-21 Sebastian Pop PR tree-optimization/36286 PR tree-optimization/36287 * lambda-code.c (build_access_matrix): Do not use the loop->num for computing the number of induction variables: use the loop depth instead. * testsuite/gcc.dg/tree-ssa/pr36287.c: New. * testsuite/gfortran.dg/pr36286.f90: New. From-SVN: r135741 --- gcc/ChangeLog | 8 ++++++++ gcc/lambda-code.c | 5 +++-- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gcc.dg/tree-ssa/pr36287.c | 22 ++++++++++++++++++++++ gcc/testsuite/gfortran.dg/pr36286.f90 | 14 ++++++++++++++ 5 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr36287.c create mode 100644 gcc/testsuite/gfortran.dg/pr36286.f90 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b71520e4550..1bf285e82fe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2008-05-21 Sebastian Pop + + PR tree-optimization/36287 + PR tree-optimization/36286 + * lambda-code.c (build_access_matrix): Do not use the loop->num + for computing the number of induction variables: use the loop depth + instead. + 2008-05-21 Kai Tietz PR/36280 diff --git a/gcc/lambda-code.c b/gcc/lambda-code.c index 707591154e1..5ae74ffa1ce 100644 --- a/gcc/lambda-code.c +++ b/gcc/lambda-code.c @@ -2794,12 +2794,13 @@ build_access_matrix (data_reference_p data_reference, struct access_matrix *am = GGC_NEW (struct access_matrix); unsigned i, ndim = DR_NUM_DIMENSIONS (data_reference); struct loop *loop = bb_for_stmt (DR_STMT (data_reference))->loop_father; - unsigned nb_induction_vars = loop_depth (loop) - loop_nest_num + 1; + struct loop *loop_nest = get_loop (loop_nest_num); + unsigned nivs = loop_depth (loop) - loop_depth (loop_nest) + 1; unsigned lambda_nb_columns; lambda_vector_vec_p matrix; AM_LOOP_NEST_NUM (am) = loop_nest_num; - AM_NB_INDUCTION_VARS (am) = nb_induction_vars; + AM_NB_INDUCTION_VARS (am) = nivs; AM_PARAMETERS (am) = parameters; lambda_nb_columns = AM_NB_COLUMNS (am); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3a88c77c1a9..9a033ede0a8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2008-05-21 Sebastian Pop + + PR tree-optimization/36287 + PR tree-optimization/36286 + * gcc.dg/tree-ssa/pr36287.c: New. + * gfortran.dg/pr36286.f90: New. + 2008-05-21 Tom Tromey PR preprocessor/27777: diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr36287.c b/gcc/testsuite/gcc.dg/tree-ssa/pr36287.c new file mode 100644 index 00000000000..51b77c7157d --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr36287.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* { dg-options "-O -ftree-loop-linear" } */ + +int tab[2][2]; + +int foo () +{ + int i, j, k; + + for (i = 0; i < 2; ++i) + for (j = 0; j < 2; ++j) + for (k = 0; k < 2; ++k) + {} + + for (i = 0; i < 2; ++i) + for (j = 0; j < 2; ++j) + if (i == 0) + tab[i][j] = 0; + + return tab[0][1]; +} + diff --git a/gcc/testsuite/gfortran.dg/pr36286.f90 b/gcc/testsuite/gfortran.dg/pr36286.f90 new file mode 100644 index 00000000000..bcdef085073 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr36286.f90 @@ -0,0 +1,14 @@ +! { dg-do compile } +! { dg-options "-O1 -ftree-loop-linear" } +! PR tree-optimization/36286 + +program test_count + integer, dimension(2,3) :: a, b + a = reshape( (/ 1, 3, 5, 2, 4, 6 /), (/ 2, 3 /)) + b = reshape( (/ 0, 3, 5, 7, 4, 8 /), (/ 2, 3 /)) + print '(3l6)', a.ne.b + print *, a(1,:).ne.b(1,:) + print *, a(2,:).ne.b(2,:) + print *, count(a.ne.b) +end program test_count + -- 2.30.2