X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircgopt.c;h=0f72657b873f1a73bd70535a2a7c87046b81f114;hb=b78bdd4d94de46de4156272e6dbfe44e97933a5b;hp=9d262002da8f456321d043b6eccd1e4cf2e93bc1;hpb=bcb649ca6c867c116ebfb4aad2a4dbe6e0bf80b8;p=libfirm

diff --git a/ir/ir/ircgopt.c b/ir/ir/ircgopt.c
index 9d262002d..0f72657b8 100644
--- a/ir/ir/ircgopt.c
+++ b/ir/ir/ircgopt.c
@@ -16,7 +16,7 @@
  * Aufrufrelation bestimmt.
  */
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 #include "ircgopt.h"
@@ -26,52 +26,79 @@
 #include "irgwalk.h"
 #include "irloop_t.h"
 #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);
   }
 }
 
+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)   ) {
+      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, entity ** keep_arr) {
-  void * MARK = &MARK;
+  void * MARK = &MARK; /* @@@ gefaehrlich!!! Aber wir markieren hoechstens zu viele ... */
   int i;
 
   if (!get_opt_dead_method_elimination()) return;
 
-  /* mark */
+  /* Mark entities that are alive.  */
   if (n_keep > 0) {
     entity ** marked = NEW_ARR_F(entity *, n_keep);
     for (i = 0; i < n_keep; ++i) {
       marked[i] = keep_arr[i];
       set_entity_link(marked[i], MARK);
+      if (get_opt_dead_method_elimination_verbose() && get_firm_verbosity() > 2) {
+        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 (ent && get_entity_irg(ent) && get_entity_link(ent) != MARK) {
+
+            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));
+              }
             }
           }
         }
@@ -81,6 +108,7 @@ void gc_irgs(int n_keep, entity ** keep_arr) {
   }
 
   /* 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);
     entity * ent = get_irg_entity(irg);
@@ -92,7 +120,7 @@ void gc_irgs(int n_keep, entity ** keep_arr) {
     if ((get_entity_visibility(ent) == visibility_local) && (get_entity_link(ent) != MARK)) {
       remove_irp_irg(irg);
       set_entity_peculiarity(ent, peculiarity_description);
-      if (get_opt_dead_method_elimination_verbose()) {
+      if (get_opt_dead_method_elimination_verbose() && get_firm_verbosity() > 1) {
         printf("dead method elimination: freeing method %s\n", get_entity_ld_name(ent));
       }
     }