From: Uros Bizjak <ubizjak@gmail.com>
Date: Thu, 10 Dec 2015 17:14:07 +0000 (+0100)
Subject: re PR tree-optimization/68619 (error: loop with header 6 not in loop tree)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3dec93d59c389bcb17830dad1e191775c4b45eed;p=gcc.git

re PR tree-optimization/68619 (error: loop with header 6 not in loop tree)

	PR tree-optimization/68619
	* graphite-scop-detection.c (gather_bbs::before_dom_children):
	Change return type to an edge.  Always return NULL.

From-SVN: r231532
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a77807efe4..a8bbe3d3546 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-10  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR tree-optimization/68619
+	* graphite-scop-detection.c (gather_bbs::before_dom_children):
+	Change return type to an edge.  Always return NULL.
+
 2015-12-10  Jeff Law  <law@redhat.com>
 
 	PR tree-optimization/68619
diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index 729a5fd5588..51c9d3d66a2 100644
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -1828,7 +1828,7 @@ class gather_bbs : public dom_walker
 public:
   gather_bbs (cdi_direction, scop_p);
 
-  virtual void before_dom_children (basic_block);
+  virtual edge before_dom_children (basic_block);
   virtual void after_dom_children (basic_block);
 
 private:
@@ -1844,11 +1844,11 @@ gather_bbs::gather_bbs (cdi_direction direction, scop_p scop)
 /* Call-back for dom_walk executed before visiting the dominated
    blocks.  */
 
-void
+edge
 gather_bbs::before_dom_children (basic_block bb)
 {
   if (!bb_in_sese_p (bb, scop->scop_info->region))
-    return;
+    return NULL;
 
   gcond *stmt = single_pred_cond_non_loop_exit (bb);
 
@@ -1868,7 +1868,7 @@ gather_bbs::before_dom_children (basic_block bb)
 
   gimple_poly_bb_p gbb = try_generate_gimple_bb (scop, bb);
   if (!gbb)
-    return;
+    return NULL;
 
   GBB_CONDITIONS (gbb) = conditions.copy ();
   GBB_CONDITION_CASES (gbb) = cases.copy ();
@@ -1880,6 +1880,8 @@ gather_bbs::before_dom_children (basic_block bb)
   data_reference_p dr;
   FOR_EACH_VEC_ELT (gbb->data_refs, i, dr)
     scop->drs.safe_push (dr_info (dr, pbb));
+
+  return NULL;
 }
 
 /* Call-back for dom_walk executed after visiting the dominated