X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_frame.c;h=7699322c9efdecc5f7a88757dfcd1c3b115cc83e;hb=87b21b8d567be43457ef9d45be329c03e692b8d3;hp=c37621ea3c96dc2a44a0e292c91bd4633630661b;hpb=800e4d37cd161f66232656944211a718ce007a4b;p=libfirm

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index c37621ea3..7699322c9 100644
--- a/ir/opt/opt_frame.c
+++ b/ir/opt/opt_frame.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -39,20 +39,21 @@
  * Optimize the frame type of an irg by removing
  * never touched entities.
  */
-void opt_frame_irg(ir_graph *irg) {
+void opt_frame_irg(ir_graph *irg)
+{
 	ir_type   *frame_tp = get_irg_frame_type(irg);
 	ir_entity *ent, *list;
 	ir_node   *frame, *sel;
-	int       i, n = get_class_n_members(frame_tp);
+	size_t    i, n = get_class_n_members(frame_tp);
 
 	if (n <= 0)
 		return;
 
-	irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
+	irp_reserve_resources(irp, IRP_RESOURCE_ENTITY_LINK);
 
 	/* clear all entity links */
-	for (i = n - 1; i >= 0; --i) {
-		ent = get_class_member(frame_tp, i);
+	for (i = n; i > 0;) {
+		ent = get_class_member(frame_tp, --i);
 		set_entity_link(ent, NULL);
 	}
 
@@ -71,6 +72,8 @@ void opt_frame_irg(ir_graph *irg) {
 			}
 		}
 	} else {
+		int i;
+
 		/* use traditionally out edges */
 		assure_irg_outs(irg);
 
@@ -88,8 +91,8 @@ void opt_frame_irg(ir_graph *irg) {
 
 	/* link unused ones */
 	list = NULL;
-	for (i = n - 1; i >= 0; --i) {
-		ent = get_class_member(frame_tp, i);
+	for (i = n; i > 0;) {
+		ent = get_class_member(frame_tp, --i);
 		/* beware of inner functions: those are NOT unused */
 		if (get_entity_link(ent) == NULL && !is_method_entity(ent)) {
 			set_entity_link(ent, list);
@@ -100,13 +103,13 @@ void opt_frame_irg(ir_graph *irg) {
 	if (list != NULL) {
 		/* delete list members */
 		for (ent = list; ent; ent = list) {
-			list = get_entity_link(ent);
-			remove_class_member(frame_tp, ent);
+			list = (ir_entity*)get_entity_link(ent);
+			free_entity(ent);
 		}
-		/* we changed the frame type, it's layout should be redefined */
+		/* we changed the frame type, its layout should be redefined */
 		set_type_state(frame_tp, layout_undefined);
 	}
-	irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
+	irp_free_resources(irp, IRP_RESOURCE_ENTITY_LINK);
 }
 
 ir_graph_pass_t *opt_frame_irg_pass(const char *name)