- add more passes

[libfirm] / ir / opt / opt_frame.c

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index b985540..3ce9254 100644 (file)
--- a/ir/opt/opt_frame.c
+++ b/ir/opt/opt_frame.c
@@ -33,6 +33,7 @@
 #include "type_t.h"
 #include "irouts.h"
 #include "iredges.h"
+#include "irtools.h"
 
 /*
  * Optimize the frame type of an irg by removing
@@ -78,7 +79,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);
                        }
                }
        }
@@ -87,7 +90,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;
                }
@@ -104,3 +108,8 @@ void opt_frame_irg(ir_graph *irg) {
        }
        irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
 }
+
+ir_graph_pass_t *opt_frame_irg_pass(const char *name, int verify, int dump)
+{
+       return def_graph_pass(name ? name : "opt_frame_irg", verify, dump, opt_frame_irg);
+}