X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcombo.c;h=45f1250748a8ec177ac0825dc392e1b2cb563fe3;hb=04aa762a930950594df01a6246c08f9d02e76dba;hp=d234258fe0ef55af27d31116887d740056bf12cf;hpb=ae9fd2c229cc7f4c724ce9ccc9263c16d77670fe;p=libfirm

diff --git a/ir/opt/combo.c b/ir/opt/combo.c
index d234258fe..45f125074 100644
--- a/ir/opt/combo.c
+++ b/ir/opt/combo.c
@@ -21,7 +21,6 @@
  * @file
  * @brief   Cliff Click's Combined Analysis/Optimization
  * @author  Michael Beck
- * @version $Id$
  *
  * This is a slightly enhanced version of Cliff Clicks combo algorithm
  * - support for commutative nodes is added, Add(a,b) and Add(b,a) ARE congruent
@@ -145,8 +144,8 @@ struct node_t {
 	node_t          *race_next;     /**< Next node on race list. */
 	lattice_elem_t  type;           /**< The associated lattice element "type". */
 	int             max_user_input; /**< Maximum input number of Def-Use edges. */
-	int             next_edge;      /**< Index of the next Def-Use edge to use. */
-	int             n_followers;    /**< Number of Follower in the outs set. */
+	unsigned        next_edge;      /**< Index of the next Def-Use edge to use. */
+	unsigned        n_followers;    /**< Number of Follower in the outs set. */
 	unsigned        on_touched:1;   /**< Set, if this node is on the partition.touched set. */
 	unsigned        on_cprop:1;     /**< Set, if this node is on the partition.cprop list. */
 	unsigned        on_fallen:1;    /**< Set, if this node is on the fallen list. */
@@ -218,7 +217,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 DEBUG_ONLY(static const char *what_reason;)
 
 /** Next partition number. */
-DEBUG_ONLY(static unsigned part_nr = 0);
+DEBUG_ONLY(static unsigned part_nr = 0;)
 
 /** The tarval returned by Unknown nodes: set to either tarval_bad OR tarval_top. */
 static ir_tarval *tarval_UNKNOWN;
@@ -268,7 +267,6 @@ static int cmp_irn_opcode(const ir_node *a, const ir_node *b)
  */
 static void check_partition(const partition_t *T)
 {
-	node_t   *node;
 	unsigned n = 0;
 
 	list_for_each_entry(node_t, node, &T->Leader, node_list) {
@@ -291,7 +289,6 @@ static void check_partition(const partition_t *T)
  */
 static void check_opcode(const partition_t *Z)
 {
-	node_t        *node;
 	const ir_node *repr = NULL;
 
 	list_for_each_entry(node_t, node, &Z->Leader, node_list) {
@@ -309,7 +306,6 @@ static void check_all_partitions(environment_t *env)
 {
 #ifdef DEBUG_libfirm
 	partition_t *P;
-	node_t      *node;
 
 	for (P = env->dbg_list; P != NULL; P = P->dbg_next) {
 		check_partition(P);
@@ -368,7 +364,6 @@ static inline lattice_elem_t get_partition_type(const partition_t *X);
  */
 static void dump_partition(const char *msg, const partition_t *part)
 {
-	const node_t   *node;
 	int            first = 1;
 	lattice_elem_t type = get_partition_type(part);
 
@@ -454,9 +449,9 @@ static void dump_split_list(const partition_t *list)
 /**
  * Dump partition and type for a node.
  */
-static int dump_partition_hook(FILE *F, ir_node *n, ir_node *local)
+static int dump_partition_hook(FILE *F, const ir_node *n, const ir_node *local)
 {
-	ir_node *irn = local != NULL ? local : n;
+	const ir_node *irn = local != NULL ? local : n;
 	node_t *node = get_irn_node(irn);
 
 	ir_fprintf(F, "info2 : \"partition %u type %+F\"\n", node->part->nr, node->type);
@@ -489,7 +484,7 @@ static void verify_type(const lattice_elem_t old_type, node_t *node)
 		/* bottom reached */
 		return;
 	}
-	panic("combo: wrong translation from %+F to %+F on node %+F", old_type, node->type, node->node);
+	panic("wrong translation from %+F to %+F on node %+F", old_type, node->type, node->node);
 }  /* verify_type */
 
 #else
@@ -544,7 +539,7 @@ static listmap_entry_t *listmap_find(listmap_t *map, void *id)
 	key.id   = id;
 	key.list = NULL;
 	key.next = NULL;
-	entry = (listmap_entry_t*)set_insert(map->map, &key, sizeof(key), HASH_PTR(id));
+	entry = set_insert(listmap_entry_t, map->map, &key, sizeof(key), hash_ptr(id));
 
 	if (entry->list == NULL) {
 		/* a new entry, put into the list */
@@ -566,12 +561,12 @@ static unsigned opcode_hash(const opcode_key_t *entry)
 	/* we cannot use the ir ops hash function here, because it hashes the
 	 * predecessors. */
 	const ir_node *n = entry->irn;
-	ir_opcode code  = get_irn_opcode(n);
+	ir_opcode code  = (ir_opcode)get_irn_opcode(n);
 	ir_mode   *mode = get_irn_mode(n);
 	unsigned hash = (unsigned)(PTR_TO_INT(mode) * 9 + code) + get_irn_arity(n);
 
 	if (code == iro_Const)
-		hash ^= (unsigned)HASH_PTR(get_Const_tarval(n));
+		hash ^= (unsigned)hash_ptr(get_Const_tarval(n));
 	else if (code == iro_Proj)
 		hash += (unsigned)get_Proj_proj(n);
 	return hash;
@@ -608,12 +603,10 @@ static int cmp_def_use_edge(const void *a, const void *b)
 static void sort_irn_outs(node_t *node)
 {
 	ir_node *irn = node->node;
-	int n_outs = get_irn_n_outs(irn);
-
-	if (n_outs > 1) {
-		qsort(&irn->out[1], n_outs, sizeof(irn->out[0]), cmp_def_use_edge);
-	}
-	node->max_user_input = irn->out[n_outs].pos;
+	unsigned n_outs = get_irn_n_outs(irn);
+	qsort(irn->o.out->edges, n_outs, sizeof(irn->o.out->edges[0]),
+		  cmp_def_use_edge);
+	node->max_user_input = n_outs > 0 ? irn->o.out->edges[n_outs-1].pos : -1;
 }  /* sort_irn_outs */
 
 /**
@@ -826,9 +819,10 @@ static void add_to_cprop(node_t *y, environment_t *env)
 	if (y->on_cprop == 0) {
 		partition_t *Y = y->part;
 		ir_node *irn   = y->node;
+		ir_node *skipped = skip_Proj(irn);
 
 		/* place Conds and all its Projs on the cprop_X list */
-		if (is_Cond(skip_Proj(irn)))
+		if (is_Cond(skipped) || is_Switch(skipped))
 			list_add_tail(&y->cprop_list, &Y->cprop_X);
 		else
 			list_add_tail(&y->cprop_list, &Y->cprop);
@@ -847,9 +841,7 @@ static void add_to_cprop(node_t *y, environment_t *env)
 	if (get_irn_mode(irn) == mode_T) {
 		/* mode_T nodes always produce tarval_bottom, so we must explicitly
 		 * add its Projs to get constant evaluation to work */
-		int i;
-
-		for (i = get_irn_n_outs(irn) - 1; i >= 0; --i) {
+		for (unsigned i = get_irn_n_outs(irn); i-- > 0; ) {
 			node_t *proj = get_irn_node(get_irn_out(irn, i));
 
 			add_to_cprop(proj, env);
@@ -890,33 +882,28 @@ static void update_worklist(partition_t *Z, partition_t *Z_prime, environment_t
  */
 static void move_edges_to_leader(node_t *x)
 {
-	ir_node     *irn = x->node;
-	int         i, j, k;
-
-	for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
+	ir_node *irn = x->node;
+	for (int i = get_irn_arity(irn) - 1; i >= 0; --i) {
 		node_t  *pred = get_irn_node(get_irn_n(irn, i));
-		ir_node *p;
-		int     n;
-
-		p = pred->node;
-		n = get_irn_n_outs(p);
-		for (j = 1; j <= pred->n_followers; ++j) {
-			if (p->out[j].pos == i && p->out[j].use == irn) {
+		ir_node *p    = pred->node;
+		unsigned n    = get_irn_n_outs(p);
+		for (unsigned j = 0; j < pred->n_followers; ++j) {
+			ir_def_use_edge edge = p->o.out->edges[j];
+			if (edge.pos == i && edge.use == irn) {
 				/* found a follower edge to x, move it to the Leader */
-				ir_def_use_edge edge = p->out[j];
-
 				/* remove this edge from the Follower set */
-				p->out[j] = p->out[pred->n_followers];
 				--pred->n_followers;
+				p->o.out->edges[j] = p->o.out->edges[pred->n_followers];
 
 				/* sort it into the leader set */
-				for (k = pred->n_followers + 2; k <= n; ++k) {
-					if (p->out[k].pos >= edge.pos)
+				unsigned k;
+				for (k = pred->n_followers+1; k < n; ++k) {
+					if (p->o.out->edges[k].pos >= edge.pos)
 						break;
-					p->out[k - 1] = p->out[k];
+					p->o.out->edges[k-1] = p->o.out->edges[k];
 				}
 				/* place the new edge here */
-				p->out[k - 1] = edge;
+				p->o.out->edges[k-1] = edge;
 
 				/* edge found and moved */
 				break;
@@ -1004,7 +991,7 @@ typedef struct step_env {
 	node_t   *initial;    /**< The initial node list. */
 	node_t   *unwalked;   /**< The unwalked node list. */
 	node_t   *walked;     /**< The walked node list. */
-	int      index;       /**< Next index of Follower use_def edge. */
+	unsigned index;       /**< Next index of Follower use_def edge. */
 	unsigned side;        /**< side number. */
 } step_env;
 
@@ -1096,7 +1083,7 @@ static int step(step_env *env)
 		/* let n be the first node in unwalked */
 		n = env->unwalked;
 		while (env->index < n->n_followers) {
-			const ir_def_use_edge *edge = &n->node->out[1 + env->index];
+			const ir_def_use_edge *edge = &n->node->o.out->edges[env->index];
 
 			/* let m be n.F.def_use[index] */
 			node_t *m = get_irn_node(edge->use);
@@ -1177,7 +1164,7 @@ static partition_t *split(partition_t **pX, node_t *gg, environment_t *env)
 	partition_t *X_prime;
 	list_head   tmp;
 	step_env    senv[2];
-	node_t      *g, *h, *node, *t;
+	node_t      *g, *h;
 	int         max_input, transitions, winner, shf;
 	unsigned    n;
 	DEBUG_ONLY(static int run = 0;)
@@ -1197,7 +1184,7 @@ static partition_t *split(partition_t **pX, node_t *gg, environment_t *env)
 
 	/* Remove gg from X.Leader and put into g */
 	g = NULL;
-	for (node = gg; node != NULL; node = node->next) {
+	for (node_t *node = gg; node != NULL; node = node->next) {
 		assert(node->part == X);
 		assert(node->is_follower == 0);
 
@@ -1268,7 +1255,7 @@ static partition_t *split(partition_t **pX, node_t *gg, environment_t *env)
 	X_prime   = new_partition(env);
 	max_input = 0;
 	n         = 0;
-	for (node = senv[winner].walked; node != NULL; node = node->race_next) {
+	for (node_t *node = senv[winner].walked; node != NULL; node = node->race_next) {
 		list_del(&node->node_list);
 		node->part = X_prime;
 		if (node->is_follower) {
@@ -1397,21 +1384,19 @@ static int type_is_neither_top_nor_const(const lattice_elem_t type)
  */
 static void collect_touched(list_head *list, int idx, environment_t *env)
 {
-	node_t  *x, *y;
+	node_t *y;
 	int     end_idx = env->end_idx;
 
 	list_for_each_entry(node_t, x, list, node_list) {
-		int num_edges;
-
 		if (idx == -1) {
 			/* leader edges start AFTER follower edges */
-			x->next_edge = x->n_followers + 1;
+			x->next_edge = x->n_followers;
 		}
-		num_edges = get_irn_n_outs(x->node);
+		unsigned num_edges = get_irn_n_outs(x->node);
 
 		/* for all edges in x.L.def_use_{idx} */
-		while (x->next_edge <= num_edges) {
-			const ir_def_use_edge *edge = &x->node->out[x->next_edge];
+		while (x->next_edge < num_edges) {
+			const ir_def_use_edge *edge = &x->node->o.out->edges[x->next_edge];
 			ir_node               *succ;
 
 			/* check if we have necessary edges */
@@ -1463,18 +1448,16 @@ static void collect_touched(list_head *list, int idx, environment_t *env)
  */
 static void collect_commutative_touched(list_head *list, environment_t *env)
 {
-	node_t  *x, *y;
+	node_t *y;
 
 	list_for_each_entry(node_t, x, list, node_list) {
-		int num_edges;
-
-		num_edges = get_irn_n_outs(x->node);
+		unsigned num_edges = get_irn_n_outs(x->node);
 
-		x->next_edge = x->n_followers + 1;
+		x->next_edge = x->n_followers;
 
 		/* for all edges in x.L.def_use_{idx} */
-		while (x->next_edge <= num_edges) {
-			const ir_def_use_edge *edge = &x->node->out[x->next_edge];
+		while (x->next_edge < num_edges) {
+			const ir_def_use_edge *edge = &x->node->o.out->edges[x->next_edge];
 			ir_node               *succ;
 
 			/* check if we have necessary edges */
@@ -1644,7 +1627,7 @@ static void cause_splits(environment_t *env)
 static partition_t *split_by_what(partition_t *X, what_func What,
                                   partition_t **P, environment_t *env)
 {
-	node_t          *x, *S;
+	node_t          *S;
 	listmap_t       map;
 	listmap_entry_t *iter;
 	partition_t     *R;
@@ -1702,7 +1685,7 @@ static void *lambda_opcode(const node_t *node, environment_t *env)
 
 	key.irn = node->node;
 
-	entry = (opcode_key_t*)set_insert(env->opcode2id_map, &key, sizeof(key), opcode_hash(&key));
+	entry = set_insert(opcode_key_t, env->opcode2id_map, &key, sizeof(key), opcode_hash(&key));
 	return entry;
 }  /* lambda_opcode */
 
@@ -1928,7 +1911,7 @@ static void compute_Block(node_t *node)
 	int     i;
 	ir_node *block = node->node;
 
-	if (block == get_irg_start_block(current_ir_graph) || has_Block_entity(block)) {
+	if (block == get_irg_start_block(current_ir_graph) || get_Block_entity(block) != NULL) {
 		/* start block and labelled blocks are always reachable */
 		node->type.tv = tarval_reachable;
 		return;
@@ -2337,90 +2320,105 @@ static void compute_Proj_Cond(node_t *node, ir_node *cond)
 	if (node->type.tv == tarval_reachable)
 		return;
 
-	if (get_irn_mode(sel) == mode_b) {
-		/* an IF */
-		if (pnc == pn_Cond_true) {
-			if (selector->type.tv == tarval_b_false) {
-				node->type.tv = tarval_unreachable;
-			} else if (selector->type.tv == tarval_b_true) {
-				node->type.tv = tarval_reachable;
-			} else if (selector->type.tv == tarval_bottom) {
-				node->type.tv = tarval_reachable;
-			} else {
-				assert(selector->type.tv == tarval_top);
-				if (tarval_UNKNOWN == tarval_top) {
-					/* any condition based on Top is "!=" */
-					node->type.tv = tarval_unreachable;
-				} else {
-					node->type.tv = tarval_unreachable;
-				}
-			}
+	if (pnc == pn_Cond_true) {
+		if (selector->type.tv == tarval_b_false) {
+			node->type.tv = tarval_unreachable;
+		} else if (selector->type.tv == tarval_b_true) {
+			node->type.tv = tarval_reachable;
+		} else if (selector->type.tv == tarval_bottom) {
+			node->type.tv = tarval_reachable;
 		} else {
-			assert(pnc == pn_Cond_false);
-
-			if (selector->type.tv == tarval_b_false) {
-				node->type.tv = tarval_reachable;
-			} else if (selector->type.tv == tarval_b_true) {
+			assert(selector->type.tv == tarval_top);
+			if (tarval_UNKNOWN == tarval_top) {
+				/* any condition based on Top is "!=" */
 				node->type.tv = tarval_unreachable;
-			} else if (selector->type.tv == tarval_bottom) {
-				node->type.tv = tarval_reachable;
 			} else {
-				assert(selector->type.tv == tarval_top);
-				if (tarval_UNKNOWN == tarval_top) {
-					/* any condition based on Top is "!=" */
-					node->type.tv = tarval_reachable;
-				} else {
-					node->type.tv = tarval_unreachable;
-				}
+				node->type.tv = tarval_unreachable;
 			}
 		}
 	} else {
-		/* an SWITCH */
-		if (selector->type.tv == tarval_bottom) {
+		assert(pnc == pn_Cond_false);
+
+		if (selector->type.tv == tarval_b_false) {
+			node->type.tv = tarval_reachable;
+		} else if (selector->type.tv == tarval_b_true) {
+			node->type.tv = tarval_unreachable;
+		} else if (selector->type.tv == tarval_bottom) {
 			node->type.tv = tarval_reachable;
-		} else if (selector->type.tv == tarval_top) {
-			if (tarval_UNKNOWN == tarval_top &&
-			    pnc == get_Cond_default_proj(cond)) {
-				/* a switch based of Top is always "default" */
+		} else {
+			assert(selector->type.tv == tarval_top);
+			if (tarval_UNKNOWN == tarval_top) {
+				/* any condition based on Top is "!=" */
 				node->type.tv = tarval_reachable;
 			} else {
 				node->type.tv = tarval_unreachable;
 			}
+		}
+	}
+}  /* compute_Proj_Cond */
+
+static void compute_Proj_Switch(node_t *node, ir_node *switchn)
+{
+	ir_node *proj     = node->node;
+	long     pnc      = get_Proj_proj(proj);
+	ir_node *sel      = get_Switch_selector(switchn);
+	node_t  *selector = get_irn_node(sel);
+
+	/* see long comment in compute_Proj_Cond */
+	if (node->type.tv == tarval_reachable)
+		return;
+
+	if (selector->type.tv == tarval_bottom) {
+		node->type.tv = tarval_reachable;
+	} else if (selector->type.tv == tarval_top) {
+		if (tarval_UNKNOWN == tarval_top && pnc == pn_Switch_default) {
+			/* a switch based of Top is always "default" */
+			node->type.tv = tarval_reachable;
 		} else {
-			long value = get_tarval_long(selector->type.tv);
-			if (pnc == get_Cond_default_proj(cond)) {
-				/* default switch, have to check ALL other cases */
-				int i;
-
-				for (i = get_irn_n_outs(cond) - 1; i >= 0; --i) {
-					ir_node *succ = get_irn_out(cond, i);
-
-					if (succ == proj)
-						continue;
-					if (value == get_Proj_proj(succ)) {
-						/* we found a match, will NOT take the default case */
-						node->type.tv = tarval_unreachable;
-						return;
-					}
+			node->type.tv = tarval_unreachable;
+		}
+	} else {
+		long                   value = get_tarval_long(selector->type.tv);
+		const ir_switch_table *table = get_Switch_table(switchn);
+		size_t                 n_entries = ir_switch_table_get_n_entries(table);
+		size_t                 e;
+
+		for (e = 0; e < n_entries; ++e) {
+			const ir_switch_table_entry *entry
+				= ir_switch_table_get_entry_const(table, e);
+			ir_tarval *min = entry->min;
+			ir_tarval *max = entry->max;
+			if (min == max) {
+				if (selector->type.tv == min) {
+					node->type.tv = entry->pn == pnc
+						? tarval_reachable : tarval_unreachable;
+					return;
 				}
-				/* all cases checked, no match, will take default case */
-				node->type.tv = tarval_reachable;
 			} else {
-				/* normal case */
-				node->type.tv = value == pnc ? tarval_reachable : tarval_unreachable;
+				long minval = get_tarval_long(min);
+				long maxval = get_tarval_long(max);
+				if (minval <= value && value <= maxval) {
+					node->type.tv = entry->pn == pnc
+						? tarval_reachable : tarval_unreachable;
+					return;
+				}
 			}
 		}
+
+		/* no entry matched: default */
+		node->type.tv
+			= pnc == pn_Switch_default ? tarval_reachable : tarval_unreachable;
 	}
-}  /* compute_Proj_Cond */
+}
 
 /**
- * (Re-)compute the type for a Proj-Node.
- *
- * @param node  the node
- */
+* (Re-)compute the type for a Proj-Node.
+*
+* @param node  the node
+*/
 static void compute_Proj(node_t *node)
 {
-	ir_node *proj = node->node;
+ir_node *proj = node->node;
 	ir_mode *mode = get_irn_mode(proj);
 	node_t  *block = get_irn_node(get_nodes_block(skip_Proj(proj)));
 	ir_node *pred  = get_Proj_pred(proj);
@@ -2430,7 +2428,7 @@ static void compute_Proj(node_t *node)
 		node->type.tv = tarval_top;
 		return;
 	}
-	if (get_irn_node(pred)->type.tv == tarval_top && !is_Cond(pred)) {
+	if (get_irn_node(pred)->type.tv == tarval_top && !is_Cond(pred) && !is_Switch(pred)) {
 		/* if the predecessor is Top, its Proj follow */
 		node->type.tv = tarval_top;
 		return;
@@ -2451,6 +2449,9 @@ static void compute_Proj(node_t *node)
 		case iro_Cond:
 			compute_Proj_Cond(node, pred);
 			return;
+		case iro_Switch:
+			compute_Proj_Switch(node, pred);
+			return;
 		default:
 			break;
 		}
@@ -2742,20 +2743,19 @@ static node_t *identity(node_t *node)
  */
 static void segregate_def_use_chain_1(const ir_node *follower, node_t *leader)
 {
-	ir_node *l   = leader->node;
-	int     j, i, n = get_irn_n_outs(l);
-
 	DB((dbg, LEVEL_2, "%+F is a follower of %+F\n", follower, leader->node));
 	/* The leader edges must remain sorted, but follower edges can
 	   be unsorted. */
-	for (i = leader->n_followers + 1; i <= n; ++i) {
-		if (l->out[i].use == follower) {
-			ir_def_use_edge t = l->out[i];
-
-			for (j = i - 1; j >= leader->n_followers + 1; --j)
-				l->out[j + 1] = l->out[j];
+	ir_node *l = leader->node;
+	unsigned n = get_irn_n_outs(l);
+	for (unsigned i = leader->n_followers; i < n; ++i) {
+		if (l->o.out->edges[i].use == follower) {
+			ir_def_use_edge t = l->o.out->edges[i];
+
+			for (unsigned j = i; j-- > leader->n_followers; )
+				l->o.out->edges[j+1] = l->o.out->edges[j];
+			l->o.out->edges[leader->n_followers] = t;
 			++leader->n_followers;
-			l->out[leader->n_followers] = t;
 			break;
 		}
 	}
@@ -2790,7 +2790,6 @@ static void propagate(environment_t *env)
 	lattice_elem_t old_type;
 	node_t         *fallen;
 	unsigned       n_fallen, old_type_was_T_or_C;
-	int            i;
 
 	while (env->cprop != NULL) {
 		void *oldopcode = NULL;
@@ -2867,7 +2866,7 @@ static void propagate(environment_t *env)
 					++n_fallen;
 					DB((dbg, LEVEL_2, "Add node %+F to fallen\n", x->node));
 				}
-				for (i = get_irn_n_outs(x->node) - 1; i >= 0; --i) {
+				for (unsigned i = get_irn_n_outs(x->node); i-- > 0; ) {
 					ir_node *succ = get_irn_out(x->node, i);
 					node_t  *y    = get_irn_node(succ);
 
@@ -2893,8 +2892,6 @@ static void propagate(environment_t *env)
 			x->on_fallen = 0;
 
 		if (old_type_was_T_or_C) {
-			node_t *y, *tmp;
-
 			/* check if some nodes will make the leader -> follower transition */
 			list_for_each_entry_safe(node_t, y, tmp, &Y->Leader, node_list) {
 				if (y->type.tv != tarval_top && ! is_con(y->type)) {
@@ -2943,9 +2940,9 @@ static ir_node *get_leader(node_t *node)
  */
 static int only_one_reachable_proj(ir_node *n)
 {
-	int i, k = 0;
+	int k = 0;
 
-	for (i = get_irn_n_outs(n) - 1; i >= 0; --i) {
+	for (unsigned i = get_irn_n_outs(n); i-- > 0; ) {
 		ir_node *proj = get_irn_out(n, i);
 		node_t  *node;
 
@@ -2971,10 +2968,15 @@ static int only_one_reachable_proj(ir_node *n)
  */
 static int can_exchange(ir_node *pred, ir_node *block)
 {
-	if (is_Start(pred) || has_Block_entity(block))
+	if (is_Start(pred) || get_Block_entity(block) != NULL)
 		return 0;
 	else if (is_Jmp(pred))
 		return 1;
+	else if (is_Raise(pred)) {
+		/* Raise is a tuple and usually has only one reachable ProjX,
+		 * but it must not be eliminated like a Jmp */
+		return 0;
+	}
 	else if (get_irn_mode(pred) == mode_T) {
 		/* if the predecessor block has more than one
 		   reachable outputs we cannot remove the block */
@@ -3024,16 +3026,9 @@ static void apply_cf(ir_node *block, void *ctx)
 			}
 		}
 
-		/* the EndBlock is always reachable even if the analysis
-		   finds out the opposite :-) */
-		if (block != get_irg_end_block(current_ir_graph)) {
-			/* mark dead blocks */
-			//set_Block_dead(block);
-			//ir_graph *irg = get_irn_irg(block);
-			//exchange(block, get_irg_bad(irg));
-			DB((dbg, LEVEL_1, "Removing dead %+F\n", block));
-		} else {
-			/* the endblock is unreachable */
+		if (block == get_irg_end_block(current_ir_graph)) {
+			/* Analysis found out that the end block is unreachable,
+			 * hence we remove all its control flow predecessors. */
 			set_irn_in(block, 0, NULL);
 		}
 		return;
@@ -3191,10 +3186,9 @@ static void exchange_leader(ir_node *irn, ir_node *leader)
  */
 static int all_users_are_dead(const ir_node *irn)
 {
-	int i, n = get_irn_n_outs(irn);
-
-	for (i = 1; i <= n; ++i) {
-		const ir_node *succ  = irn->out[i].use;
+	unsigned n = get_irn_n_outs(irn);
+	for (unsigned i = 0; i < n; ++i) {
+		const ir_node *succ  = get_irn_out(irn, i);
 		const node_t  *block = get_irn_node(get_nodes_block(succ));
 		const node_t  *node;
 
@@ -3305,7 +3299,7 @@ static void apply_result(ir_node *irn, void *ctx)
 				/* leave or Jmp */
 				ir_node *cond = get_Proj_pred(irn);
 
-				if (is_Cond(cond)) {
+				if (is_Cond(cond) || is_Switch(cond)) {
 					if (only_one_reachable_proj(cond)) {
 						ir_node *jmp = new_r_Jmp(block->node);
 						set_irn_node(jmp, node);
@@ -3315,14 +3309,16 @@ static void apply_result(ir_node *irn, void *ctx)
 						exchange(irn, jmp);
 						env->modified = 1;
 					} else {
-						node_t    *sel = get_irn_node(get_Cond_selector(cond));
-						ir_tarval *tv  = sel->type.tv;
-
-						if (is_tarval(tv) && tarval_is_constant(tv)) {
-							/* The selector is a constant, but more
-							 * than one output is active: An unoptimized
-							 * case found. */
-							env->unopt_cf = 1;
+						if (is_Switch(cond)) {
+							node_t    *sel = get_irn_node(get_Switch_selector(cond));
+							ir_tarval *tv  = sel->type.tv;
+
+							if (is_tarval(tv) && tarval_is_constant(tv)) {
+								/* The selector is a constant, but more
+								 * than one output is active: An unoptimized
+								 * case found. */
+								env->unopt_cf = 1;
+							}
 						}
 					}
 				}
@@ -3444,8 +3440,8 @@ static void set_compute_functions(void)
 	size_t i, n;
 
 	/* set the default compute function */
-	for (i = 0, n = get_irp_n_opcodes(); i < n; ++i) {
-		ir_op *op = get_irp_opcode(i);
+	for (i = 0, n = ir_get_n_opcodes(); i < n; ++i) {
+		ir_op *op = ir_get_opcode(i);
 		op->ops.generic = (op_func)default_compute;
 	}
 
@@ -3501,6 +3497,11 @@ void combo(ir_graph *irg)
 	ir_graph      *rem = current_ir_graph;
 	size_t        len;
 
+	assure_irg_properties(irg,
+		IR_GRAPH_PROPERTY_NO_BADS
+		| IR_GRAPH_PROPERTY_CONSISTENT_OUTS
+		| IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO);
+
 	current_ir_graph = irg;
 
 	/* register a debug mask */
@@ -3526,14 +3527,11 @@ void combo(ir_graph *irg)
 	env.commutative    = 1;
 	env.opt_unknown    = 1;
 
-	assure_irg_outs(irg);
-	assure_cf_loop(irg);
-
 	/* we have our own value_of function */
 	set_value_of_func(get_node_tarval);
 
 	set_compute_functions();
-	DEBUG_ONLY(part_nr = 0);
+	DEBUG_ONLY(part_nr = 0;)
 
 	ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_PHI_LIST);
 
@@ -3548,7 +3546,7 @@ void combo(ir_graph *irg)
 	irg_walk_graph(irg, create_initial_partitions, init_block_phis, &env);
 
 	/* set the hook: from now, every node has a partition and a type */
-	DEBUG_ONLY(set_dump_node_vcgattr_hook(dump_partition_hook));
+	DEBUG_ONLY(set_dump_node_vcgattr_hook(dump_partition_hook);)
 
 	/* all nodes on the initial partition have type Top */
 	env.initial->type_is_T_or_C = 1;
@@ -3593,18 +3591,10 @@ void combo(ir_graph *irg)
 		DB((dbg, LEVEL_1, "Unoptimized Control Flow left"));
 	}
 
-	if (env.modified) {
-		/* control flow might changed */
-		set_irg_extblk_inconsistent(irg);
-		set_irg_doms_inconsistent(irg);
-		set_irg_loopinfo_inconsistent(irg);
-		set_irg_entity_usage_state(irg, ir_entity_usage_not_computed);
-	}
-
 	ir_free_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_PHI_LIST);
 
 	/* remove the partition hook */
-	DEBUG_ONLY(set_dump_node_vcgattr_hook(NULL));
+	DEBUG_ONLY(set_dump_node_vcgattr_hook(NULL);)
 
 	DEL_ARR_F(env.kept_memory);
 	del_set(env.opcode2id_map);
@@ -3613,6 +3603,8 @@ void combo(ir_graph *irg)
 	/* restore value_of() default behavior */
 	set_value_of_func(NULL);
 	current_ir_graph = rem;
+
+	confirm_irg_properties(irg, IR_GRAPH_PROPERTIES_NONE);
 }  /* combo */
 
 /* Creates an ir_graph pass for combo. */