From: Richard Biener <rguenther@suse.de>
Date: Wed, 28 Feb 2018 15:33:33 +0000 (+0000)
Subject: re PR tree-optimization/84584 ([graphite] ICE: Segmentation fault (in dominated_by_p))
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e0e545fc6f1afcaebe9bafa45ab0a42332de945;p=gcc.git

re PR tree-optimization/84584 ([graphite] ICE: Segmentation fault (in dominated_by_p))

2018-02-28  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/84584
	* graphite-scop-detection.c (scop_detection::add_scop): Discard
	SCoPs with fake exit edge.

	* gcc.dg/graphite/pr84584.c: New testcase.

From-SVN: r258070
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 820b926ced7..dcea097318a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-28  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/84584
+	* graphite-scop-detection.c (scop_detection::add_scop): Discard
+	SCoPs with fake exit edge.
+
 2018-02-28  Martin Liska  <mliska@suse.cz>
 
 	PR testsuite/84597
diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index 2331dec6919..48e40142e59 100644
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -590,6 +590,15 @@ scop_detection::add_scop (sese_l s)
 {
   gcc_assert (s);
 
+  /* If the exit edge is fake discard the SCoP for now as we're removing the
+     fake edges again after analysis.  */
+  if (s.exit->flags & EDGE_FAKE)
+    {
+      DEBUG_PRINT (dp << "[scop-detection-fail] Discarding infinite loop SCoP: ";
+		   print_sese (dump_file, s));
+      return;
+    }
+
   /* Include the BB with the loop-closed SSA PHI nodes, we need this
      block in the region for code-generating out-of-SSA copies.
      canonicalize_loop_closed_ssa makes sure that is in proper shape.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 694a0184677..d12f8103f8f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-28  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/84584
+	* gcc.dg/graphite/pr84584.c: New testcase.
+
 2018-02-28  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR preprocessor/84517
diff --git a/gcc/testsuite/gcc.dg/graphite/pr84584.c b/gcc/testsuite/gcc.dg/graphite/pr84584.c
new file mode 100644
index 00000000000..a6c619494dd
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/graphite/pr84584.c
@@ -0,0 +1,23 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fgraphite-identity -fno-tree-loop-im" } */
+
+int q3, w1;
+
+void
+bw (int b8)
+{
+  const int sd = 2;
+  int mc;
+
+  for (mc = 0; mc < sd; ++mc)
+    {
+ik:
+      for (w1 = 0; w1 < sd; ++w1)
+	++b8;
+    }
+
+  for (q3 = 0; q3 < sd; ++q3)
+    ;
+
+  goto ik;
+}