diff mbox

[RFA,PR,tree-optimization/68619] Avoid direct cfg cleanups in tree-ssa-dom.c [4/3] v2

Message ID CAFULd4bTPWR2agcDoaRutuAUwgQJxbdR0YnD9oEYuyU8cucnGw@mail.gmail.com
State New
Headers show

Commit Message

Uros Bizjak Dec. 10, 2015, 5:05 p.m. UTC 
> Finally the mechanical changes necessary due to the API change in the walker.

You forgot to change the graphite part, as in the attached patch.

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.

OK for mainline after successful bootstrap and regtest?

Uros.

Comments

Jeff Law Dec. 10, 2015, 5:09 p.m. UTC | #1 
On 12/10/2015 10:05 AM, Uros Bizjak wrote:
>> Finally the mechanical changes necessary due to the API change in the walker.
>
> You forgot to change the graphite part, as in the attached patch.
>
> 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.
>
> OK for mainline after successful bootstrap and regtest?
Yes.

Sorry about that.

jeff
Sebastian Pop Dec. 11, 2015, 4:46 p.m. UTC | #2 
Uros Bizjak wrote:
> > Finally the mechanical changes necessary due to the API change in the walker.
> 
> You forgot to change the graphite part, as in the attached patch.
> 
> 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.
> 
> OK for mainline after successful bootstrap and regtest?

Yes.  Thanks for the patch.

Sebastian
diff mbox

Patch

Index: graphite-scop-detection.c
===================================================================
--- graphite-scop-detection.c	(revision 231529)
+++ graphite-scop-detection.c	(working copy)
@@ -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, s
 /* 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,7 @@  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