X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_frame.c;h=a038e093f3fea8489059f89680cc27736be865a5;hb=f2c2e45eb4e677fef5bf6a8e418b2a22441172d5;hp=9ef1abdbc84c41188e754584493a1780d42d4bec;hpb=0fbcef83aa6060534172bb13e71cdadb04428806;p=libfirm

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index 9ef1abdbc..a038e093f 100644
--- a/ir/opt/opt_frame.c
+++ b/ir/opt/opt_frame.c
@@ -47,6 +47,8 @@ void opt_frame_irg(ir_graph *irg) {
 	if (n <= 0)
 		return;
 
+	irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
+
 	/* clear all entity links */
 	for (i = n - 1; i >= 0; --i) {
 		ent = get_class_member(frame_tp, i);
@@ -62,8 +64,10 @@ void opt_frame_irg(ir_graph *irg) {
 		/* mark all used entities */
 		foreach_out_edge(frame, edge) {
 			sel = get_edge_src_irn(edge);
-			ent = get_Sel_entity(sel);
-			set_entity_link(ent, ent);
+			if (is_Sel(sel)) {
+				ent = get_Sel_entity(sel);
+				set_entity_link(ent, ent);
+			}
 		}
 	} else {
 		/* use traditionally out edges */
@@ -72,8 +76,12 @@ void opt_frame_irg(ir_graph *irg) {
 		/* mark all used entities */
 		for (i = get_irn_n_outs(frame) - 1; i >= 0; --i) {
 			sel = get_irn_out(frame, i);
-			ent = get_Sel_entity(sel);
-			set_entity_link(ent, ent);
+			if (is_Sel(sel)) {
+				ent = get_Sel_entity(sel);
+				/* only entities on the frame */
+				if (get_entity_owner(ent) == frame_tp)
+					set_entity_link(ent, ent);
+			}
 		}
 	}
 
@@ -81,7 +89,8 @@ void opt_frame_irg(ir_graph *irg) {
 	list = NULL;
 	for (i = n - 1; i >= 0; --i) {
 		ent = get_class_member(frame_tp, i);
-		if (get_entity_link(ent) == NULL) {
+		/* beware of inner functions: those are NOT unused */
+		if (get_entity_link(ent) == NULL && !is_method_entity(ent)) {
 			set_entity_link(ent, list);
 			list = ent;
 		}
@@ -96,4 +105,5 @@ void opt_frame_irg(ir_graph *irg) {
 		/* we changed the frame type, it's layout should be redefined */
 		set_type_state(frame_tp, layout_undefined);
 	}
+	irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
 }