X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fircgopt.c;h=2b28f563f32aed59c300154fd8dc9eceaf3eb928;hb=e669cdc1b57e7226b656c1c18816f71c3dc89347;hp=b462fc6644312257b124744da2f6d1ac3668f03c;hpb=98b53ae767eab1441e57a89b9e27a5f51748a68c;p=libfirm

diff --git a/ir/opt/ircgopt.c b/ir/opt/ircgopt.c
index b462fc664..2b28f563f 100644
--- a/ir/opt/ircgopt.c
+++ b/ir/opt/ircgopt.c
@@ -30,9 +30,7 @@
  * der nicht erreichbaren Methoden wird aus der Abschätzung der
  * Aufrufrelation bestimmt.
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "ircgopt.h"
 
@@ -43,7 +41,9 @@
 #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);
 
@@ -63,9 +63,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 (get_kind(tore) == k_entity) {
-		ir_entity *ent = (ir_entity *)tore;
+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)      &&
@@ -108,7 +108,7 @@ void gc_irgs(int n_keep, ir_entity ** keep_arr) {
 				ir_node *node = get_irg_end(irg);
 
 				/* collect calls */
-				set_using_irn_link(irg);
+				ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
 				irg_walk_graph(irg, firm_clear_link, collect_call, node);
 
 				/* iterate calls */
@@ -128,7 +128,7 @@ void gc_irgs(int n_keep, ir_entity ** keep_arr) {
 						}
 					}
 				}
-				clear_using_irn_link(irg);
+				ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 			}
 		}
 		DEL_ARR_F(marked);
@@ -145,11 +145,35 @@ void gc_irgs(int n_keep, ir_entity ** keep_arr) {
 			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));
+			remove_irp_irg(irg);
+			set_entity_peculiarity(ent, peculiarity_description);
 		}
 		set_entity_link(ent, NULL);
 	}
 }
+
+/**
+ * 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);
+}