X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_frame.c;h=a038e093f3fea8489059f89680cc27736be865a5;hb=151f1b110fe2c1ead4ae8dd66a2521f35c324946;hp=1212540a3f11f2a2cd5d4465cc102a4a8b93dde2;hpb=d26f85fe13d8aef7526144370a693d13c2f02578;p=libfirm

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index 1212540a3..a038e093f 100644
--- a/ir/opt/opt_frame.c
+++ b/ir/opt/opt_frame.c
@@ -64,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 */
@@ -74,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);
+			}
 		}
 	}
 
@@ -83,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;
 		}