Fixed warning: Made global variable static.
[libfirm] / ir / opt / critical_edges.c
index 4717244..392fa26 100644 (file)
@@ -22,7 +22,6 @@
  * @brief    Remove critical edges.
  * @author   Christian Schaefer, Goetz Lindenmaier, Sebastian Felis,
  *           Michael Beck
- * @version  $Id$
  */
 #include "config.h"
 
@@ -69,11 +68,11 @@ static void walk_critical_cf_edges(ir_node *n, void *env)
 
                        cfop = get_irn_op(skip_Proj(pre));
                        if (is_op_fragile(cfop)) {
-                               if (cenv->ignore_exc_edges && get_Proj_proj(pre) == pn_Generic_X_except)
+                               if (cenv->ignore_exc_edges && is_x_except_Proj(pre))
                                        continue;
                                goto insert;
                        }
-                       if (is_IJmp(pre)) {
+                       if (is_unknown_jump(pre)) {
                                /* we can't add blocks in between ijmp and its destinations
                                 * TODO: What now, we can't split all critical edges because of this... */
                                fprintf(stderr, "libfirm warning: Couldn't split all critical edges (compiler will probably fail now)\n");
@@ -90,9 +89,9 @@ insert:
                                /* set successor of new block */
                                set_irn_n(n, i, jmp);
                                cenv->changed = 1;
-                       } /* predecessor has multiple successors */
-               } /* for all predecessors */
-       } /* n is a multi-entry block */
+                       }
+               }
+       }
 }
 
 void remove_critical_cf_edges_ex(ir_graph *irg, int ignore_exception_edges)
@@ -105,11 +104,9 @@ void remove_critical_cf_edges_ex(ir_graph *irg, int ignore_exception_edges)
        irg_block_walk_graph(irg, NULL, walk_critical_cf_edges, &env);
        if (env.changed) {
                /* control flow changed */
-               set_irg_outs_inconsistent(irg);
-               set_irg_extblk_inconsistent(irg);
-               set_irg_doms_inconsistent(irg);
-               set_irg_loopinfo_inconsistent(irg);
+               clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE);
        }
+       add_irg_properties(irg, IR_GRAPH_PROPERTY_NO_CRITICAL_EDGES);
 }
 
 void remove_critical_cf_edges(ir_graph *irg)