added prototype for firm_init_flags(),

[libfirm] / ir / ir / ircgopt.c

diff --git a/ir/ir/ircgopt.c b/ir/ir/ircgopt.c
index 060fc99..0f72657 100644 (file)
--- a/ir/ir/ircgopt.c
+++ b/ir/ir/ircgopt.c
@@ -28,14 +28,14 @@
 #include "irflag_t.h"
 #include "ircons.h"
 #include "typewalk.h"
+#include "irtools.h"
 
-static void clear_link(ir_node * node, void * env) {
-  set_irn_link(node, NULL);
-}
-
+/**
+ * Walker: adds Call operations to a head's link list.
+ */
+static void collect_call(ir_node * node, void *env) {
+  ir_node *head = env;
 
-/* Call-Operationen an die "link"-Liste von "call_head" anhängen. */
-static void collect_call(ir_node * node, ir_node * head) {
   if (get_irn_op(node) == op_Call) {
     set_irn_link(node, get_irn_link(head));
     set_irn_link(head, node);
@@ -46,14 +46,12 @@ static void make_entity_to_description(type_or_ent *tore, void *env) {
   if (get_kind(tore) == k_entity) {
     entity *ent = (entity *)tore;
 
-    if ((is_method_type(get_entity_type(ent)))                        &&
-       (get_entity_peculiarity(ent) != peculiarity_description)      &&
-       (get_entity_visibility(ent)  != visibility_external_allocated)   ) {
+    if ((is_Method_type(get_entity_type(ent)))                        &&
+        (get_entity_peculiarity(ent) != peculiarity_description)      &&
+        (get_entity_visibility(ent)  != visibility_external_allocated)   ) {
       entity *impl = get_SymConst_entity(get_atomic_ent_value(ent));
       if (get_entity_link(impl) != env) {
-       set_entity_peculiarity(ent, peculiarity_description);
-       //set_atomic_ent_value(ent, new_r_Const(get_const_code_irg(), get_irg_start_block(get_const_code_irg()),
-       //                                    mode_P, get_tarval_null(mode_P)));
+        set_entity_peculiarity(ent, peculiarity_description);
       }
     }
   }
@@ -76,26 +74,31 @@ void gc_irgs(int n_keep, entity ** keep_arr) {
         printf("dead method elimination: method %s kept alive.\n", get_entity_ld_name(marked[i]));
       }
     }
+
     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 */
-        irg_walk_graph(irg, clear_link, (irg_walk_func *) collect_call, node);
+        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(get_irn_op(node) == op_Call);
+
           for (i = get_Call_n_callees(node) - 1; i >= 0; --i) {
             entity * ent = get_Call_callee(node, i);
+
             if (get_entity_irg(ent) && get_entity_link(ent) != MARK) {
               set_entity_link(ent, MARK);
               ARR_APP1(entity *, marked, ent);
-             if (get_opt_dead_method_elimination_verbose() && get_firm_verbosity() > 2) {
-               printf("dead method elimination: method %s can be called from Call %ld: kept alive.\n",
-                      get_entity_ld_name(ent), get_irn_node_nr(node));
-             }
+              if (get_opt_dead_method_elimination_verbose() && get_firm_verbosity() > 2) {
+                printf("dead method elimination: method %s can be called from Call %ld: kept alive.\n",
+                      get_entity_ld_name(ent), get_irn_node_nr(node));
+              }
             }
           }
         }