X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firconsconfirm.c;h=9ec685e9e40fb359d9e1d15d6449bd99f41b6408;hb=75ad3990591ea0913566d05276ef23b79c15d94c;hp=d9a2c17ebf7dcfb1bd79aebfa9ff99b9203a7562;hpb=c79fe4adc914d8d867772053bedf449a4f85645d;p=libfirm

diff --git a/ir/ana/irconsconfirm.c b/ir/ana/irconsconfirm.c
index d9a2c17eb..9ec685e9e 100644
--- a/ir/ana/irconsconfirm.c
+++ b/ir/ana/irconsconfirm.c
@@ -214,6 +214,7 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t *
 				if (c_b == NULL) {
 					ir_node *c_true  = new_Const(tarval_b_true);
 					ir_node *c_false = new_Const(tarval_b_false);
+					env->num_consts += 2;
 					if (pnc == pn_Cond_true) {
 						c_b = c_true;
 						c_o = c_false;
@@ -232,6 +233,7 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t *
 				}
 				phi = new_r_Phi(user_blk, n, in, mode_b);
 				set_irn_n(user, pos, phi);
+				env->num_eq += 1;
 			}
 		}
 	}
@@ -298,39 +300,40 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env)
 				DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, user, right));
 
 				env->num_eq += 1;
-			} else if (block_dominates(blk, cond_block)) {
-				if (is_Const(right) && get_irn_pinned(user) == op_pin_state_floats) {
-					/*
-					 * left == Const and we found a movable user of left in a
-					 * dominator of the Cond block
-					 */
-					const ir_edge_t *edge, *next;
-					for (edge = get_irn_out_edge_first(user); edge; edge = next) {
-						ir_node *usr_of_usr = get_edge_src_irn(edge);
-						int      npos = get_edge_src_pos(edge);
-						ir_node *blk  = get_effective_use_block(usr_of_usr, npos);
-
-						next = get_irn_out_edge_next(user, edge);
-						if (block_dominates(block, blk)) {
-							/*
-							 * The user of the user is dominated by our true/false
-							 * block. So, create a copy of user WITH the constant
-							 * replacing it's pos'th input.
-							 *
-							 * This is always good for unop's and might be good
-							 * for binops.
-							 *
-							 * If user has other user in the false/true block, code
-							 * placement will move it down.
-							 * If there are users in cond block or upper, we create
-							 * "redundant ops", because one will have a const op,
-							 * the other no const ...
-							 */
-							ir_node *new_op = exact_copy(user);
-							set_nodes_block(new_op, block);
-							set_irn_n(new_op, pos, right);
-							set_irn_n(usr_of_usr, npos, new_op);
-						}
+			} else if (block_dominates(blk, cond_block)
+					&& is_Const(right)
+					&& get_irn_pinned(user) == op_pin_state_floats) {
+				/*
+				 * left == Const and we found a movable user of left in a
+				 * dominator of the Cond block
+				 */
+				const ir_edge_t *edge, *next;
+				for (edge = get_irn_out_edge_first(user); edge; edge = next) {
+					ir_node *usr_of_usr = get_edge_src_irn(edge);
+					int      npos = get_edge_src_pos(edge);
+					ir_node *blk  = get_effective_use_block(usr_of_usr, npos);
+
+					next = get_irn_out_edge_next(user, edge);
+					if (block_dominates(block, blk)) {
+						/*
+						 * The user of the user is dominated by our true/false
+						 * block. So, create a copy of user WITH the constant
+						 * replacing it's pos'th input.
+						 *
+						 * This is always good for unop's and might be good
+						 * for binops.
+						 *
+						 * If user has other user in the false/true block, code
+						 * placement will move it down.
+						 * If there are users in cond block or upper, we create
+						 * "redundant ops", because one will have a const op,
+						 * the other no const ...
+						 */
+						ir_node *new_op = exact_copy(user);
+						set_nodes_block(new_op, block);
+						set_irn_n(new_op, pos, right);
+						set_irn_n(usr_of_usr, npos, new_op);
+						env->num_eq += 1;
 					}
 				}
 			}
@@ -564,7 +567,6 @@ void construct_confirms(ir_graph *irg)
 	env_t env;
 	int edges_active = edges_activated(irg);
 
-
 	FIRM_DBG_REGISTER(dbg, "firm.ana.confirm");
 
 	remove_critical_cf_edges(irg);