X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fscalar_replace.c;h=5e7a00e95540984ddb2540ed90428ffff57e8c04;hb=a63ae9728ba0fbe891a2bb6c291c41b0e618af62;hp=8c87f7780f49fd2438048787fcb88e497954aeed;hpb=d935aa267d00966c360931d2f0f43008030c0592;p=libfirm

diff --git a/ir/opt/scalar_replace.c b/ir/opt/scalar_replace.c
index 8c87f7780..5e7a00e95 100644
--- a/ir/opt/scalar_replace.c
+++ b/ir/opt/scalar_replace.c
@@ -23,9 +23,7 @@
  * @author  Beyhan Veliev, Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
@@ -270,36 +268,34 @@ int is_address_taken(ir_node *sel)
  *
  * @param ent  the entity that will be scalar replaced
  * @param sel  a Sel node that selects some fields of this entity
- *
- * Uses the visited flag to mark already linked Sel nodes.
  */
-static void link_all_leave_sels(ir_entity *ent, ir_node *sel) {
-	int i, flag = 1;
+static int link_all_leave_sels(ir_entity *ent, ir_node *sel) {
+	int i, is_leave = 1;
 
 	for (i = get_irn_n_outs(sel) - 1; i >= 0; --i) {
 		ir_node *succ = get_irn_out(sel, i);
 
 		if (is_Sel(succ)) {
+			/* the current leave has further Sel's, no leave */
+			is_leave = 0;
 			link_all_leave_sels(ent, succ);
-			flag = 0;
+		} else if (is_Id(succ)) {
+			is_leave &= link_all_leave_sels(ent, succ);
 		}
 	}
 
-	if (flag) {
-		/* if Sel nodes with memory inputs are used, a entity can be
-		 * visited more than once causing a ring here, so we use the
-		 * node flag to mark linked nodes
-		 */
-		if (irn_visited_else_mark(sel))
-			return;
+	if (is_leave) {
+		/* beware of Id's */
+		sel = skip_Id(sel);
 
 		/* we know we are at a leave, because this function is only
-		 * called if the address is NOT taken, so succ must be a Load
-		 * or a Store node
+		 * called if the address is NOT taken, so sel's successor(s)
+		 * must be Loads or Stores
 		 */
 		set_irn_link(sel, get_entity_link(ent));
 		set_entity_link(ent, sel);
 	}
+	return is_leave;
 }
 
 /* we need a special address that serves as an address taken marker */
@@ -323,12 +319,9 @@ static void *ADDRESS_TAKEN = &_x;
 static int find_possible_replacements(ir_graph *irg) {
 	ir_node *irg_frame;
 	ir_type *frame_tp;
-	int     i;
+	int     i, j, k, static_link_arg;
 	int     res = 0;
 
-	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
-	inc_irg_visited(irg);
-
 	/*
 	 * First, clear the link field of all interesting entities.
 	 */
@@ -338,6 +331,38 @@ static int find_possible_replacements(ir_graph *irg) {
 		set_entity_link(ent, NULL);
 	}
 
+	/* check for inner functions:
+	 * FIXME: need a way to get the argument position for the static link */
+	static_link_arg = 0;
+	for (i = get_class_n_members(frame_tp) - 1; i >= 0; --i) {
+		ir_entity *ent = get_class_member(frame_tp, i);
+		if (is_method_entity(ent)) {
+			ir_graph *inner_irg = get_entity_irg(ent);
+			ir_node  *args;
+
+			assure_irg_outs(inner_irg);
+			args = get_irg_args(inner_irg);
+			for (j = get_irn_n_outs(args) - 1; j >= 0; --j) {
+				ir_node *arg = get_irn_out(args, j);
+
+				if (get_Proj_proj(arg) == static_link_arg) {
+					for (k = get_irn_n_outs(arg) - 1; k >= 0; --k) {
+						ir_node *succ = get_irn_out(arg, k);
+
+						if (is_Sel(succ)) {
+							ir_entity *ent = get_Sel_entity(succ);
+
+							if (get_entity_owner(ent) == frame_tp) {
+								/* found an access to the outer frame */
+								set_entity_link(ent, ADDRESS_TAKEN);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
 	/*
 	 * Check the ir_graph for Sel nodes. If the entity of Sel
 	 * isn't a scalar replacement set the link of this entity
@@ -351,6 +376,11 @@ static int find_possible_replacements(ir_graph *irg) {
 			ir_entity *ent = get_Sel_entity(succ);
 			ir_type *ent_type;
 
+			/* we are only interested in entities on the frame, NOT
+			   on the value type */
+			if (get_entity_owner(ent) != frame_tp)
+				continue;
+
 			if (get_entity_link(ent) == ADDRESS_TAKEN)
 				continue;
 
@@ -370,7 +400,8 @@ static int find_possible_replacements(ir_graph *irg) {
 			/* we can handle arrays, structs and atomic types yet */
 			if (is_Array_type(ent_type) || is_Struct_type(ent_type) || is_atomic_type(ent_type)) {
 				if (is_address_taken(succ)) {
-					if (get_entity_link(ent)) /* killing one */
+					 /* killing one */
+					if (get_entity_link(ent))
 						--res;
 					set_entity_link(ent, ADDRESS_TAKEN);
 				} else {
@@ -383,7 +414,6 @@ static int find_possible_replacements(ir_graph *irg) {
 		}
 	}
 
-	ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 	return res;
 }
 
@@ -581,13 +611,14 @@ 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);
+
 		/* Beware: A Store can contain a hidden conversion in Firm. */
 		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]);
 
-		block = get_nodes_block(node);
-		set_cur_block(block);
 		set_value(vnum, val);
 
 		mem = get_Store_mem(node);
@@ -651,9 +682,13 @@ int scalar_replacement_opt(ir_graph *irg) {
 	/* Call algorithm that computes the out edges */
 	assure_irg_outs(irg);
 
+	/* we use the link firld to store the VNUM */
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
+	irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
+
 	/* Find possible scalar replacements */
 	if (find_possible_replacements(irg)) {
-		DB((dbg, SET_LEVEL_1, "Scalar Replacement: %s\n", get_entity_name(get_irg_entity(irg))));
+		DB((dbg, SET_LEVEL_1, "Scalar Replacement: %+F\n", irg));
 
 		/* Insert in set the scalar replacements. */
 		irg_frame = get_irg_frame(irg);
@@ -718,6 +753,9 @@ int scalar_replacement_opt(ir_graph *irg) {
 		DEL_ARR_F(modes);
 	}
 
+	ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
+	irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
+
 	current_ir_graph = rem;
 	return res;
 }