From b0bd3e52c1b5b59bd416298ae0794342ec319d86 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 11 Jan 2018 13:42:29 +0000 Subject: [PATCH] re PR tree-optimization/83435 (ICE in set_value_range, at tree-vrp.c:211) 2018-01-11 Richard Biener PR tree-optimization/83435 * graphite.c (canonicalize_loop_form): Ignore fake loop exit edges. * graphite-scop-detection.c (scop_detection::get_sese): Likewise. * tree-vrp.c (add_assert_info): Drop TREE_OVERFLOW if they appear. * gcc.dg/graphite/pr83435.c: New testcase. From-SVN: r256535 --- gcc/ChangeLog | 7 +++++++ gcc/graphite-scop-detection.c | 2 +- gcc/graphite.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/graphite/pr83435.c | 25 +++++++++++++++++++++++++ gcc/tree-vrp.c | 2 ++ 6 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/graphite/pr83435.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f27395d5e7f..6c8fdd1645f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-01-11 Richard Biener + + PR tree-optimization/83435 + * graphite.c (canonicalize_loop_form): Ignore fake loop exit edges. + * graphite-scop-detection.c (scop_detection::get_sese): Likewise. + * tree-vrp.c (add_assert_info): Drop TREE_OVERFLOW if they appear. + 2018-01-11 Richard Sandiford Alan Hayward David Sherwood diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c index b15b26dbb22..1f2f990b690 100644 --- a/gcc/graphite-scop-detection.c +++ b/gcc/graphite-scop-detection.c @@ -428,7 +428,7 @@ scop_detection::get_sese (loop_p loop) edge scop_begin = loop_preheader_edge (loop); edge scop_end = single_exit (loop); - if (!scop_end || (scop_end->flags & EDGE_COMPLEX)) + if (!scop_end || (scop_end->flags & (EDGE_COMPLEX|EDGE_FAKE))) return invalid_sese; /* Include the BB with the loop-closed SSA PHI nodes. canonicalize_loop_closed_ssa makes sure that is in proper shape. */ diff --git a/gcc/graphite.c b/gcc/graphite.c index 3b7f46bebd6..bcf48284f75 100644 --- a/gcc/graphite.c +++ b/gcc/graphite.c @@ -324,7 +324,7 @@ canonicalize_loop_form (void) FOR_EACH_LOOP (loop, LI_FROM_INNERMOST) { edge e = single_exit (loop); - if (!e || (e->flags & EDGE_COMPLEX)) + if (!e || (e->flags & (EDGE_COMPLEX|EDGE_FAKE))) continue; canonicalize_loop_closed_ssa (loop, e); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index afd7327b3d7..fde8bcc383e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-01-11 Richard Biener + + PR tree-optimization/83435 + * gcc.dg/graphite/pr83435.c: New testcase. + 2018-01-11 Richard Sandiford Alan Hayward David Sherwood diff --git a/gcc/testsuite/gcc.dg/graphite/pr83435.c b/gcc/testsuite/gcc.dg/graphite/pr83435.c new file mode 100644 index 00000000000..1b70c861f43 --- /dev/null +++ b/gcc/testsuite/gcc.dg/graphite/pr83435.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-options "-O -ftree-parallelize-loops=2 -floop-parallelize-all" } */ + +int yj, ax; + +void +gf (signed char mp) +{ + int *dh = &yj; + + for (;;) + { + signed char sb; + + for (sb = 0; sb < 1; sb -= 8) + { + } + + mp &= mp <= sb; + if (mp == 0) + dh = &ax; + mp = 0; + *dh = 0; + } +} diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 69762ab795e..3294bde9b94 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -2786,6 +2786,8 @@ add_assert_info (vec &asserts, assert_info info; info.comp_code = comp_code; info.name = name; + if (TREE_OVERFLOW_P (val)) + val = drop_tree_overflow (val); info.val = val; info.expr = expr; asserts.safe_push (info); -- 2.30.2