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

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index 029d009ad..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 */
@@ -76,7 +78,9 @@ void opt_frame_irg(ir_graph *irg) {
 			sel = get_irn_out(frame, i);
 			if (is_Sel(sel)) {
 				ent = get_Sel_entity(sel);
-				set_entity_link(ent, ent);
+				/* only entities on the frame */
+				if (get_entity_owner(ent) == frame_tp)
+					set_entity_link(ent, ent);
 			}
 		}
 	}
@@ -85,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;
 		}