X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=4fc0169aa03e8ecfbbd4038809d7cbc981c15fbd;hb=203717b8dd44597fb10c126b33a28528a2432e9c;hp=6310159805812e5d435306ad5fb4fb38aa1d36ea;hpb=48873feb6430467ba3b0d541ec7ae489cf429f25;p=libfirm

diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c
index 631015980..4fc0169aa 100644
--- a/ir/ir/iropt.c
+++ b/ir/ir/iropt.c
@@ -2027,74 +2027,6 @@ static ir_node *transform_node_Add(ir_node *n) {
 			DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_MINUS_B);
 			return n;
 		}
-		if (! is_reassoc_running()) {
-			/* do NOT execute this code if reassociation is enabled, it does the inverse! */
-			if (is_Mul(a)) {
-				ir_node *ma = get_Mul_left(a);
-				ir_node *mb = get_Mul_right(a);
-
-				if (b == ma) {
-					ir_node *blk = get_irn_n(n, -1);
-					n = new_rd_Mul(
-							get_irn_dbg_info(n), current_ir_graph, blk,
-							ma,
-							new_rd_Add(
-								get_irn_dbg_info(n), current_ir_graph, blk,
-								mb,
-								new_r_Const_long(current_ir_graph, blk, mode, 1),
-								mode),
-							mode);
-					DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-					return n;
-				} else if (b == mb) {
-					ir_node *blk = get_irn_n(n, -1);
-					n = new_rd_Mul(
-							get_irn_dbg_info(n), current_ir_graph, blk,
-							mb,
-							new_rd_Add(
-								get_irn_dbg_info(n), current_ir_graph, blk,
-								ma,
-								new_r_Const_long(current_ir_graph, blk, mode, 1),
-								mode),
-							mode);
-					DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-					return n;
-				}
-			}
-			if (is_Mul(b)) {
-				ir_node *ma = get_Mul_left(b);
-				ir_node *mb = get_Mul_right(b);
-
-				if (a == ma) {
-					ir_node *blk = get_irn_n(n, -1);
-					n = new_rd_Mul(
-							get_irn_dbg_info(n), current_ir_graph, blk,
-							ma,
-							new_rd_Add(
-								get_irn_dbg_info(n), current_ir_graph, blk,
-								mb,
-								new_r_Const_long(current_ir_graph, blk, mode, 1),
-								mode),
-							mode);
-					DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-					return n;
-				}
-				if (a == mb) {
-					ir_node *blk = get_irn_n(n, -1);
-					n = new_rd_Mul(
-							get_irn_dbg_info(n), current_ir_graph, blk,
-							mb,
-							new_rd_Add(
-								get_irn_dbg_info(n), current_ir_graph, blk,
-								ma,
-								new_r_Const_long(current_ir_graph, blk, mode, 1),
-								mode),
-							mode);
-					DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-					return n;
-				}
-			}
-		}
 		if (get_mode_arithmetic(mode) == irma_twos_complement) {
 			/* Here we rely on constants be on the RIGHT side */
 			if (is_Not(a)) {
@@ -3005,7 +2937,8 @@ static ir_node *transform_bitwise_distributive(ir_node *n,
 		ir_node *b_left  = get_binop_left(b);
 		ir_node *b_right = get_binop_right(b);
 		ir_node *c       = NULL;
-		ir_node *op1, *op2;
+		ir_node *op1     = NULL;
+		ir_node *op2     = NULL;
 
 		if (is_op_commutative(op)) {
 			if (a_left == b_left) {
@@ -4735,6 +4668,12 @@ static ir_node *transform_node_Conv(ir_node *n) {
 			return c;
 		}
 	}
+
+	if (is_Unknown(a)) { /* Conv_A(Unknown_B) -> Unknown_A */
+		ir_mode *mode = get_irn_mode(n);
+		return new_r_Unknown(current_ir_graph, mode);
+	}
+
 	return n;
 }  /* transform_node_Conv */