X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircgopt.c;h=06cef8351f2ee1e829a8f15ebeb08772b769e778;hb=19975388facbb3943fbc2aa2f5f9422350bb5cb3;hp=59fa9a5cbbd6978bac3c94f30bd9835d6dcbf97d;hpb=c2b4a9f3d77fda7989e9cbd6293b9f9f58f4221c;p=libfirm

diff --git a/ir/ir/ircgopt.c b/ir/ir/ircgopt.c
index 59fa9a5cb..06cef8351 100644
--- a/ir/ir/ircgopt.c
+++ b/ir/ir/ircgopt.c
@@ -15,14 +15,17 @@
  * 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.h"
+#include "irflag_t.h"
 
 static void clear_link(ir_node * node, void * env) {
   set_irn_link(node, NULL);
@@ -44,6 +47,8 @@ void gc_irgs(int n_keep, entity ** keep_arr) {
   void * MARK = &MARK;
   int i;
 
+  if (!get_opt_dead_method_elimination()) return;
+
   /* mark */
   if (n_keep > 0) {
     entity ** marked = NEW_ARR_F(entity *, n_keep);
@@ -52,19 +57,22 @@ void gc_irgs(int n_keep, entity ** keep_arr) {
       set_entity_link(marked[i], MARK);
     }
     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 (ent && get_entity_irg(ent) && get_entity_link(ent) != MARK) {
+	      set_entity_link(ent, MARK);
+	      ARR_APP1(entity *, marked, ent);
+	    }
 	  }
 	}
       }
@@ -76,9 +84,15 @@ void gc_irgs(int n_keep, entity ** keep_arr) {
   for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
     ir_graph * irg = get_irp_irg(i);
     entity * ent = get_irg_ent(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_link(ent) != MARK) {
       remove_irp_irg(irg);
-      set_entity_peculiarity(ent, description);
+      set_entity_peculiarity(ent, peculiarity_description);
+      if (get_opt_dead_method_elimination_verbose())
+	printf("dead method elimination: freeing method %s\n", get_entity_ld_name(ent));
     }
     set_entity_link(ent, NULL);
   }