From 4f683506df6ae4137d5cd362ccb8a50302cf8a2d Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 19 Mar 2019 08:06:48 +0000 Subject: [PATCH] re PR rtl-optimization/89753 (ICE in unroll_loop_constant_iterations, at loop-unroll.c:498) PR rtl-optimization/89753 * loop-unroll.c (decide_unroll_constant_iterations): Make guard for explicit unrolling factor even more robust. From-SVN: r269791 --- gcc/ChangeLog | 6 ++++++ gcc/loop-unroll.c | 2 +- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/c-c++-common/unroll-7.c | 11 +++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/c-c++-common/unroll-7.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 568435819d7..5ef58714b3e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-03-19 Eric Botcazou + + PR rtl-optimization/89753 + * loop-unroll.c (decide_unroll_constant_iterations): Make guard for + explicit unrolling factor even more robust. + 2019-03-19 Jakub Jelinek PR target/89726 diff --git a/gcc/loop-unroll.c b/gcc/loop-unroll.c index 0164762bee9..bc7840e4bfa 100644 --- a/gcc/loop-unroll.c +++ b/gcc/loop-unroll.c @@ -400,7 +400,7 @@ decide_unroll_constant_iterations (struct loop *loop, int flags) { /* However we cannot unroll completely at the RTL level a loop with constant number of iterations; it should have been peeled instead. */ - if ((unsigned) loop->unroll > desc->niter - 1) + if (desc->niter == 0 || (unsigned) loop->unroll > desc->niter - 1) { if (dump_file) fprintf (dump_file, ";; Loop should have been peeled\n"); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ae077a1fc8e..4e35805af65 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-03-19 Eric Botcazou + + * c-c++-common/unroll-7.c: New test. + 2019-03-19 Jakub Jelinek PR target/89726 diff --git a/gcc/testsuite/c-c++-common/unroll-7.c b/gcc/testsuite/c-c++-common/unroll-7.c new file mode 100644 index 00000000000..8332e9f983c --- /dev/null +++ b/gcc/testsuite/c-c++-common/unroll-7.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O -fno-tree-dominator-opts" } */ + +int nv; + +void test (void) +{ + #pragma GCC unroll 2 + for (nv = 0; nv < 1; ++nv) + {} +} -- 2.30.2