- add more passes

[libfirm] / ir / opt / opt_frame.c

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index 66c5734..3ce9254 100644 (file)
--- a/ir/opt/opt_frame.c
+++ b/ir/opt/opt_frame.c
@@ -26,15 +26,14 @@
  * @summary
  *   Optimize the frame type by removing unused type members.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "iroptimize.h"
 #include "irgraph_t.h"
 #include "type_t.h"
 #include "irouts.h"
 #include "iredges.h"
+#include "irtools.h"
 
 /*
  * Optimize the frame type of an irg by removing
@@ -49,6 +48,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);
@@ -64,8 +65,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 +77,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 +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;
                }
@@ -98,4 +106,10 @@ 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);
+}
+
+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);
 }