X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fscalar_replace.c;h=b0d76ca8e501a484fae622a79b36457f6d66d694;hb=f864dbddcf026827e85d49544abbb002841a5405;hp=a4cd2ab471549256a88fb8946ba62dfe9350a002;hpb=8c8f929ee3dbb8e269fb2b6e8e35296ae0153adc;p=libfirm

diff --git a/ir/opt/scalar_replace.c b/ir/opt/scalar_replace.c
index a4cd2ab47..b0d76ca8e 100644
--- a/ir/opt/scalar_replace.c
+++ b/ir/opt/scalar_replace.c
@@ -131,7 +131,7 @@ static int is_const_sel(ir_node *sel) {
 	for (i = 0; i < n; ++i) {
 		ir_node *idx = get_Sel_index(sel, i);
 
-		if (get_irn_op(idx) != op_Const)
+		if (!is_Const(idx))
 			return 0;
 	}
 	return 1;
@@ -172,9 +172,9 @@ static int check_load_store_mode(ir_mode *mode, ir_mode *ent_mode) {
  */
 int is_address_taken(ir_node *sel)
 {
-	int     i;
-	ir_mode *emode, *mode;
-	ir_node *value;
+	int       i, input_nr, k;
+	ir_mode   *emode, *mode;
+	ir_node   *value;
 	ir_entity *ent;
 
 	if (! is_const_sel(sel))
@@ -185,15 +185,15 @@ int is_address_taken(ir_node *sel)
 
 		switch (get_irn_opcode(succ)) {
 		case iro_Load:
+			/* do not remove volatile variables */
+			if (get_Load_volatility(succ) == volatility_is_volatile)
+				return 1;
 			/* check if this load is not a hidden conversion */
 			mode = get_Load_mode(succ);
 			ent = get_Sel_entity(sel);
 			emode = get_type_mode(get_entity_type(ent));
 			if (! check_load_store_mode(mode, emode))
 				return 1;
-			/* do not remove volatile variables */
-			if (get_Load_volatility(succ) == volatility_is_volatile)
-				return 1;
 			break;
 
 		case iro_Store:
@@ -201,15 +201,15 @@ int is_address_taken(ir_node *sel)
 			value = get_Store_value(succ);
 			if (value == sel)
 				return 1;
+			/* do not remove volatile variables */
+			if (get_Store_volatility(succ) == volatility_is_volatile)
+				return 1;
 			/* check if this Store is not a hidden conversion */
 			mode = get_irn_mode(value);
 			ent = get_Sel_entity(sel);
 			emode = get_type_mode(get_entity_type(ent));
 			if (! check_load_store_mode(mode, emode))
 				return 1;
-			/* do not remove volatile variables */
-			if (get_Store_volatility(succ) == volatility_is_volatile)
-				return 1;
 			break;
 
 		case iro_Sel: {
@@ -230,6 +230,33 @@ int is_address_taken(ir_node *sel)
 			 */
 			return 1;
 
+		case iro_Id: {
+			int res = is_address_taken(succ);
+			if (res)
+				return 1;
+			break;
+		}
+
+		case iro_Tuple:
+			/* Non-optimized Tuple, happens in inlining */
+			for (input_nr = get_Tuple_n_preds(succ) - 1; input_nr >= 0; --input_nr) {
+				ir_node *pred = get_Tuple_pred(succ, input_nr);
+
+				if (pred == sel) {
+					/* we found one input */
+					for (k = get_irn_n_outs(succ) - 1; k >= 0; --k) {
+						ir_node *proj = get_irn_out(succ, k);
+
+						if (is_Proj(proj) && get_Proj_proj(proj) == input_nr) {
+							int res = is_address_taken(proj);
+							if (res)
+								return 1;
+						}
+					}
+				}
+			}
+			break;
+
 		default:
 			/* another op, the address is taken */
 			return 1;
@@ -301,7 +328,7 @@ static int find_possible_replacements(ir_graph *irg) {
 	int     i;
 	int     res = 0;
 
-	set_using_irn_visited(irg);
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
 	inc_irg_visited(irg);
 
 	/*
@@ -358,7 +385,7 @@ static int find_possible_replacements(ir_graph *irg) {
 		}
 	}
 
-	clear_using_irn_visited(irg);
+	ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 	return res;
 }
 
@@ -488,12 +515,11 @@ typedef struct _env_t {
  */
 static void topologic_walker(ir_node *node, void *ctx) {
 	env_t        *env = ctx;
-	ir_op        *op = get_irn_op(node);
 	ir_node      *adr, *block, *mem, *val;
 	ir_mode      *mode;
 	unsigned     vnum;
 
-	if (op == op_Load) {
+	if (is_Load(node)) {
 		/* a load, check if we can resolve it */
 		adr = get_Load_ptr(node);
 
@@ -514,6 +540,9 @@ static void topologic_walker(ir_node *node, void *ctx) {
 
 		DB((dbg, SET_LEVEL_3, "replacing by value %u\n", vnum));
 
+		block = get_nodes_block(node);
+		set_cur_block(block);
+
 		/* check, if we can replace this Load */
 		val = get_value(vnum, env->modes[vnum]);
 
@@ -529,13 +558,12 @@ static void topologic_walker(ir_node *node, void *ctx) {
 			val = new_d_Conv(get_irn_dbg_info(node), val, mode);
 
 		mem = get_Load_mem(node);
-		block = get_nodes_block(node);
 		turn_into_tuple(node, pn_Load_max);
 		set_Tuple_pred(node, pn_Load_M,         mem);
 		set_Tuple_pred(node, pn_Load_res,       val);
-		set_Tuple_pred(node, pn_Load_X_regular, new_r_Jmp(current_ir_graph, block));
+		set_Tuple_pred(node, pn_Load_X_regular, new_Jmp());
 		set_Tuple_pred(node, pn_Load_X_except,  new_Bad());
-	} else if (op == op_Store) {
+	} else if (is_Store(node)) {
 		DB((dbg, SET_LEVEL_3, "  checking %+F for replacement ", node));
 
 		/* a Store always can be replaced */
@@ -560,14 +588,15 @@ static void topologic_walker(ir_node *node, void *ctx) {
 		val = get_Store_value(node);
 		if (get_irn_mode(val) != env->modes[vnum])
 			val = new_d_Conv(get_irn_dbg_info(node), val, env->modes[vnum]);
-		set_value(vnum, val);
 
-		mem = get_Store_mem(node);
 		block = get_nodes_block(node);
+		set_cur_block(block);
+		set_value(vnum, val);
 
+		mem = get_Store_mem(node);
 		turn_into_tuple(node, pn_Store_max);
 		set_Tuple_pred(node, pn_Store_M,         mem);
-		set_Tuple_pred(node, pn_Store_X_regular, new_r_Jmp(current_ir_graph, block));
+		set_Tuple_pred(node, pn_Store_X_regular, new_Jmp());
 		set_Tuple_pred(node, pn_Store_X_except,  new_Bad());
 	}
 }