New still buggy version:

[libfirm] / ir / opt / opt_frame.c

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index 029d009..a038e09 100644 (file)
--- 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;
                }