X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fopt%2Fcritical_edges.c;h=11b282d551abf6bc26ada9e4c64f0b4825912663;hb=183c08a8d00578cfc700cdd0d8387b920a5996da;hp=0afa802a939a0b66a13084ad9d95c9e455188528;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm

diff --git a/ir/opt/critical_edges.c b/ir/opt/critical_edges.c
index 0afa802a9..11b282d55 100644
--- a/ir/opt/critical_edges.c
+++ b/ir/opt/critical_edges.c
@@ -22,7 +22,6 @@
  * @brief    Remove critical edges.
  * @author   Christian Schaefer, Goetz Lindenmaier, Sebastian Felis,
  *           Michael Beck
- * @version  $Id$
  */
 #include "config.h"
 
@@ -50,7 +49,7 @@ static void walk_critical_cf_edges(ir_node *n, void *env)
 {
 	int arity, i;
 	ir_node *pre, *block, *jmp;
-	cf_env *cenv = env;
+	cf_env *cenv = (cf_env*)env;
 	ir_graph *irg = get_irn_irg(n);
 
 	/* Block has multiple predecessors */
@@ -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,10 @@ 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_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE
+		                   | IR_GRAPH_STATE_VALID_EXTENDED_BLOCKS);
 	}
+	set_irg_state(irg, IR_GRAPH_STATE_NO_CRITICAL_EDGES);
 }
 
 void remove_critical_cf_edges(ir_graph *irg)