X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircgopt.c;h=060fc99e779aec2ecd4918c101f548dd043f16d7;hb=8399216d8aebc713bbda04b6e3e250a1d52b20bf;hp=06d594a035c0cfa0529c34cd7cfc24ad8ecd4c06;hpb=f3c5532f1098aac8f21bef20301e07c65d101c7f;p=libfirm

diff --git a/ir/ir/ircgopt.c b/ir/ir/ircgopt.c
index 06d594a03..060fc99e7 100644
--- a/ir/ir/ircgopt.c
+++ b/ir/ir/ircgopt.c
@@ -15,14 +15,19 @@
  * der nicht erreichbaren Methoden wird aus der Abschätzung der
  * Aufrufrelation bestimmt.
  */
-
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "ircgopt.h"
 
 #include "array.h"
 #include "irprog.h"
 #include "irgwalk.h"
-
+#include "irloop_t.h"
+#include "irflag_t.h"
+#include "ircons.h"
+#include "typewalk.h"
 
 static void clear_link(ir_node * node, void * env) {
   set_irn_link(node, NULL);
@@ -37,48 +42,84 @@ static void collect_call(ir_node * node, ir_node * head) {
   }
 }
 
+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);
+	//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)));
+      }
+    }
+  }
+}
 
 /* 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;
 
-  /* mark */
+  if (!get_opt_dead_method_elimination()) return;
+
+  /* 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) {
-      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);
-      /* 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) {
-	    set_entity_link(ent, MARK);
-	    ARR_APP1(entity *, marked, ent);
-	  }
-	}
+      /* 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);
+        /* 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));
+	      }
+            }
+          }
+        }
       }
     }
     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);
-    entity * ent = get_irg_ent(irg);
-    if (get_entity_link(ent) != MARK) {
+    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);
+      if (get_opt_dead_method_elimination_verbose() && get_firm_verbosity() > 1) {
+        printf("dead method elimination: freeing method %s\n", get_entity_ld_name(ent));
+      }
     }
     set_entity_link(ent, NULL);
   }