X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_frame.c;h=c28abd8f12b794ff85bf2c5643a4aa0d015f9fb6;hb=8c9921a1fc166552f6e416434fd8394a4fc210a3;hp=1212540a3f11f2a2cd5d4465cc102a4a8b93dde2;hpb=d26f85fe13d8aef7526144370a693d13c2f02578;p=libfirm

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index 1212540a3..c28abd8f1 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.
  *
@@ -22,8 +22,7 @@
  * @brief   Optimize the frame type.
  * @date    15.03.2006
  * @author  Michael Beck
- * @version $Id$
- * @summary
+ * @brief
  *   Optimize the frame type by removing unused type members.
  */
 #include "config.h"
@@ -33,25 +32,27 @@
 #include "type_t.h"
 #include "irouts.h"
 #include "iredges.h"
+#include "irpass.h"
 
 /*
  * 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);
 	}
 
@@ -64,26 +65,35 @@ void opt_frame_irg(ir_graph *irg) {
 		/* mark all used entities */
 		foreach_out_edge(frame, edge) {
 			sel = get_edge_src_irn(edge);
-			ent = get_Sel_entity(sel);
-			set_entity_link(ent, ent);
+			if (is_Sel(sel)) {
+				ent = get_Sel_entity(sel);
+				set_entity_link(ent, ent);
+			}
 		}
 	} else {
+		int i;
+
 		/* use traditionally out edges */
 		assure_irg_outs(irg);
 
 		/* mark all used entities */
 		for (i = get_irn_n_outs(frame) - 1; i >= 0; --i) {
 			sel = get_irn_out(frame, i);
-			ent = get_Sel_entity(sel);
-			set_entity_link(ent, ent);
+			if (is_Sel(sel)) {
+				ent = get_Sel_entity(sel);
+				/* only entities on the frame */
+				if (get_entity_owner(ent) == frame_tp)
+					set_entity_link(ent, ent);
+			}
 		}
 	}
 
 	/* link unused ones */
 	list = NULL;
-	for (i = n - 1; i >= 0; --i) {
-		ent = get_class_member(frame_tp, i);
-		if (get_entity_link(ent) == NULL) {
+	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);
 			list = ent;
 		}
@@ -92,11 +102,16 @@ 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)
+{
+	return def_graph_pass(name ? name : "opt_frame_irg", opt_frame_irg);
 }