simplify confusing entity/owner interfaces. There is no public way anymore to add...

[libfirm] / ir / opt / ircgopt.c

diff --git a/ir/opt/ircgopt.c b/ir/opt/ircgopt.c
index b27abd4..bfe98e4 100644 (file)
--- a/ir/opt/ircgopt.c
+++ b/ir/opt/ircgopt.c
@@ -41,14 +41,17 @@
 #include "irloop_t.h"
 #include "irflag_t.h"
 #include "ircons.h"
+#include "cgana.h"
 #include "irtools.h"
+#include "irpass.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg);
 
 /**
  * Walker: adds Call operations to a head's link list.
  */
-static void collect_call(ir_node *node, void *env) {
+static void collect_call(ir_node *node, void *env)
+{
        ir_node *head = env;
 
        if (is_Call(node)) {
@@ -57,27 +60,9 @@ static void collect_call(ir_node *node, void *env) {
        }
 }
 
-/**
- * Type walker, set the peculiarity of entities which graphs
- * gets removed to peculiarity_description.
- */
-static void make_entity_to_description(type_or_ent tore, void *env) {
-       if (is_entity(tore.ent)) {
-               ir_entity *ent = tore.ent;
-
-               if ((is_Method_type(get_entity_type(ent)))                        &&
-                       (get_entity_peculiarity(ent) != peculiarity_description)      &&
-                       (get_entity_visibility(ent)  != visibility_external_allocated)   ) {
-                               ir_entity *impl = get_SymConst_entity(get_atomic_ent_value(ent));
-                               if (get_entity_link(impl) != env) {
-                                       set_entity_peculiarity(ent, peculiarity_description);
-                               }
-               }
-       }
-}
-
 /* garbage collect methods: mark and remove */
-void gc_irgs(int n_keep, ir_entity ** keep_arr) {
+void gc_irgs(int n_keep, ir_entity ** keep_arr)
+{
        void * MARK = &MARK; /* @@@ gefaehrlich!!! Aber wir markieren hoechstens zu viele ... */
        int i;
 
@@ -100,54 +85,75 @@ void gc_irgs(int n_keep, ir_entity ** keep_arr) {
                }
 
                for (i = 0; i < ARR_LEN(marked); ++i) {
-                       /* check for extern methods, these don't have an IRG */
-                       if (get_entity_visibility(marked[i]) != visibility_external_allocated) {
-                               ir_graph *irg = get_entity_irg(marked[i]);
-                               ir_node *node = get_irg_end(irg);
-
-                               /* collect calls */
-                               ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
-                               irg_walk_graph(irg, firm_clear_link, collect_call, node);
-
-                               /* iterate calls */
-                               for (node = get_irn_link(node); node; node = get_irn_link(node)) {
-                                       int i;
-                                       assert(is_Call(node));
-
-                                       for (i = get_Call_n_callees(node) - 1; i >= 0; --i) {
-                                               ir_entity *ent = get_Call_callee(node, i);
-
-                                               if (get_entity_irg(ent) && get_entity_link(ent) != MARK) {
-                                                       set_entity_link(ent, MARK);
-                                                       ARR_APP1(ir_entity *, marked, ent);
-
-                                                       DB((dbg, LEVEL_1, "  method %+F can be called from Call %+F: kept alive.\n",
-                                                           ent, node));
-                                               }
+                       ir_graph *irg = get_entity_irg(marked[i]);
+                       ir_node *node;
+
+                       if (irg == NULL)
+                               continue;
+
+                       node = get_irg_end(irg);
+
+                       /* collect calls */
+                       ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
+                       irg_walk_graph(irg, firm_clear_link, collect_call, node);
+
+                       /* iterate calls */
+                       for (node = get_irn_link(node); node; node = get_irn_link(node)) {
+                               int i;
+                               assert(is_Call(node));
+
+                               for (i = get_Call_n_callees(node) - 1; i >= 0; --i) {
+                                       ir_entity *ent = get_Call_callee(node, i);
+
+                                       if (get_entity_irg(ent) && get_entity_link(ent) != MARK) {
+                                               set_entity_link(ent, MARK);
+                                               ARR_APP1(ir_entity *, marked, ent);
+
+                                               DB((dbg, LEVEL_1, "  method %+F can be called from Call %+F: kept alive.\n",
+                                                       ent, node));
                                        }
                                }
-                               ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
                        }
+                       ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
                }
                DEL_ARR_F(marked);
        }
 
        /* clean */
-       type_walk(make_entity_to_description, NULL, MARK);
        for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
                ir_graph  *irg = get_irp_irg(i);
                ir_entity *ent = get_irg_entity(irg);
-               /* Removing any graph invalidates all interprocedural loop trees. */
-               if (get_irg_loopinfo_state(irg) == loopinfo_ip_consistent ||
-                   get_irg_loopinfo_state(irg) == loopinfo_ip_inconsistent) {
-                       free_loop_information(irg);
-               }
-               if ((get_entity_visibility(ent) == visibility_local) && (get_entity_link(ent) != MARK)) {
-                       remove_irp_irg(irg);
-                       set_entity_peculiarity(ent, peculiarity_description);
 
-                       DB((dbg, LEVEL_1, "  freeing method %+F\n",     ent));
-               }
-               set_entity_link(ent, NULL);
+               if (get_entity_link(ent) == MARK)
+                       continue;
+
+               DB((dbg, LEVEL_1, "  freeing method %+F\n",     ent));
+               remove_irp_irg(irg);
+
+               free_entity(ent);
        }
 }
+
+/**
+ * Wrapper for running gc_irgs() as an ir_prog pass.
+ */
+static void pass_wrapper(void)
+{
+    ir_entity **keep_methods;
+    int         arr_len;
+
+    /* Analysis that finds the free methods,
+       i.e. methods that are dereferenced.
+       Optimizes polymorphic calls :-). */
+    cgana(&arr_len, &keep_methods);
+
+    /* Remove methods that are never called. */
+    gc_irgs(arr_len, keep_methods);
+
+    free(keep_methods);
+}
+
+ir_prog_pass_t *gc_irgs_pass(const char *name)
+{
+       return def_prog_pass(name ? name : "cgana", pass_wrapper);
+}