From b25f84d0ff01aa4014428402029c46cda4c4a2a0 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 9 Jan 2018 08:55:26 +0000 Subject: [PATCH] re PR tree-optimization/83572 ([graphite] ICE in verify_dominators, at dominance.c:1184 (error: dominator of 7 should be 15, not 13)) 2018-01-09 Richard Biener PR tree-optimization/83572 * graphite.c: Include cfganal.h. (graphite_transform_loops): Connect infinite loops to exit and remove fake edges at the end. * gcc.dg/graphite/pr83572.c: New testcase. From-SVN: r256372 --- gcc/ChangeLog | 7 +++++++ gcc/graphite.c | 10 +++++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/graphite/pr83572.c | 22 ++++++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/graphite/pr83572.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8045f55b0fc..813dca6472d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-01-09 Richard Biener + + PR tree-optimization/83572 + * graphite.c: Include cfganal.h. + (graphite_transform_loops): Connect infinite loops to exit + and remove fake edges at the end. + 2018-01-09 Jan Hubicka * ipa-inline.c (edge_badness): Revert accidental checkin. diff --git a/gcc/graphite.c b/gcc/graphite.c index 8208d3dc32b..e5f318d44fd 100644 --- a/gcc/graphite.c +++ b/gcc/graphite.c @@ -38,6 +38,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-pass.h" #include "params.h" #include "pretty-print.h" +#include "cfganal.h" #ifdef HAVE_isl #include "cfghooks.h" @@ -350,6 +351,10 @@ graphite_transform_loops (void) calculate_dominance_info (CDI_DOMINATORS); + /* We rely on post-dominators during merging of SESE regions so those + have to be meaningful. */ + connect_infinite_loops_to_exit (); + ctx = isl_ctx_alloc (); isl_options_set_on_error (ctx, ISL_ON_ERROR_ABORT); the_isl_ctx = ctx; @@ -368,6 +373,10 @@ graphite_transform_loops (void) build_scops (&scops); free_dominance_info (CDI_POST_DOMINATORS); + /* Remove the fake exits before transform given they are not reflected + in loop structures we end up verifying. */ + remove_fake_exit_edges (); + if (dump_file && (dump_flags & TDF_DETAILS)) { print_graphite_statistics (dump_file, scops); @@ -428,7 +437,6 @@ graphite_transform_loops (void) release_recorded_exits (cfun); tree_estimate_probability (false); } - } #else /* If isl is not available: #ifndef HAVE_isl. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c73af5e087a..ffade44558c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-01-09 Richard Biener + + PR tree-optimization/83572 + * gcc.dg/graphite/pr83572.c: New testcase. + 2018-01-09 Jakub Jelinek PR target/83507 diff --git a/gcc/testsuite/gcc.dg/graphite/pr83572.c b/gcc/testsuite/gcc.dg/graphite/pr83572.c new file mode 100644 index 00000000000..1f65dc34fd1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/graphite/pr83572.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* { dg-options "-O -floop-nest-optimize -fno-tree-loop-im" } */ + +int u0, l1; + +void +u3 (int s1) +{ + for (;;) + { + for (u0 = 0; u0 < 2; ++u0) + { + } + + if (s1 != 0) + for (l1 = 0; l1 < 2; ++l1) + { + } + + l1 = 0; + } +} -- 2.30.2