X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fgarbage_collect.c;h=7fc81ec8b07e912faaeac533d2df983338e21faf;hb=07c77ebb4b165865ecdfc45a048ac55dea14d84e;hp=44ca05c531e91c5b488912e604e29c2e847feb65;hpb=1a26f4853c07d1ecd68a097409dd602edfe29eff;p=libfirm

diff --git a/ir/opt/garbage_collect.c b/ir/opt/garbage_collect.c
index 44ca05c53..7fc81ec8b 100644
--- a/ir/opt/garbage_collect.c
+++ b/ir/opt/garbage_collect.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,7 +21,6 @@
  * @file
  * @brief    Removal of unreachable methods.
  * @author   Matthias Braun
- * @version  $Id$
  */
 #include "config.h"
 
@@ -36,7 +35,7 @@
 #include "error.h"
 #include "debug.h"
 
-DEBUG_ONLY(static firm_dbg_module_t *dbg);
+DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 
 static void visit_entity(ir_entity *entity);
 
@@ -65,7 +64,6 @@ static void start_visit_node(ir_node *node)
 	if (get_irg_visited(irg) < get_max_irg_visited()) {
 		set_irg_visited(irg, get_max_irg_visited());
 	}
-	current_ir_graph = irg;
 	irg_walk_2(node, visit_node, NULL, NULL);
 }
 
@@ -103,8 +101,8 @@ static void visit_entity(ir_entity *entity)
 	if (entity->initializer != NULL) {
 		visit_initializer(entity->initializer);
 	}  else if (entity_has_compound_ent_values(entity)) {
-		int i;
-		int n_members = get_compound_ent_n_values(entity);
+		size_t i;
+		size_t n_members = get_compound_ent_n_values(entity);
 		for (i = 0; i < n_members; ++i) {
 			ir_node *node = get_compound_ent_value(entity, i);
 			start_visit_node(node);
@@ -124,7 +122,7 @@ static void visit_segment(ir_type *segment)
 
 	for (i = 0; i < n_entities; ++i) {
 		ir_entity *entity = get_compound_member(segment, i);
-		if (get_entity_visibility(entity) != ir_visibility_default
+		if (get_entity_visibility(entity) != ir_visibility_external
 				&& !(get_entity_linkage(entity) & IR_LINKAGE_HIDDEN_USER))
 			continue;
 
@@ -144,20 +142,19 @@ static void garbage_collect_in_segment(ir_type *segment)
 
 		DB((dbg, LEVEL_1, "  removing entity %+F\n", entity));
 
-		/* TODO: this is O(n^2) improve our interfaces! */
-		remove_class_member(get_entity_owner(entity), entity);
+		free_entity(entity);
 	}
 }
 
 void garbage_collect_entities(void)
 {
-	int          i;
+	size_t       i;
 	ir_segment_t s;
 
 	FIRM_DBG_REGISTER(dbg, "firm.opt.garbagecollect");
 
 	/* start a type walk for all externally visible entities */
-	irp_reserve_resources(irp, IR_RESOURCE_TYPE_VISITED);
+	irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED);
 	inc_master_type_visited();
 	inc_max_irg_visited();
 
@@ -171,14 +168,14 @@ void garbage_collect_entities(void)
 	/* remove graphs of non-visited functions
 	 * (we have to count backwards so we can safely call remove_irp_irg
 	 *  while iterating) */
-	for (i = get_irp_n_irgs()-1; i >= 0; --i) {
-		ir_graph  *irg    = get_irp_irg(i);
+	for (i = get_irp_n_irgs(); i > 0;) {
+		ir_graph  *irg    = get_irp_irg(--i);
 		ir_entity *entity = get_irg_entity(irg);
 
 		if (entity_visited(entity))
 			continue;
 
-		DB((dbg, LEVEL_1, "  freeing method %+F\n",	entity));
+		DB((dbg, LEVEL_1, "  freeing method %+F\n", entity));
 		remove_irp_irg(irg);
 	}
 
@@ -187,7 +184,7 @@ void garbage_collect_entities(void)
 		ir_type *type = get_segment_type(s);
 		garbage_collect_in_segment(type);
 	}
-	irp_free_resources(irp, IR_RESOURCE_TYPE_VISITED);
+	irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED);
 }
 
 ir_prog_pass_t *garbage_collect_entities_pass(const char *name)