X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_frame.c;h=c37621ea3c96dc2a44a0e292c91bd4633630661b;hb=6b124543aff56817fcfe6d5b5ff181ac5c790e73;hp=6c911938cc1751d918d43861430cccbc662ce919;hpb=c04778051703517e339ed91c11cfc880b57c4426;p=libfirm

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index 6c911938c..c37621ea3 100644
--- a/ir/opt/opt_frame.c
+++ b/ir/opt/opt_frame.c
@@ -23,18 +23,17 @@
  * @date    15.03.2006
  * @author  Michael Beck
  * @version $Id$
- * @summary
+ * @brief
  *   Optimize the frame type by removing unused type members.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "iroptimize.h"
 #include "irgraph_t.h"
 #include "type_t.h"
 #include "irouts.h"
 #include "iredges.h"
+#include "irpass.h"
 
 /*
  * Optimize the frame type of an irg by removing
@@ -49,6 +48,8 @@ void opt_frame_irg(ir_graph *irg) {
 	if (n <= 0)
 		return;
 
+	irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
+
 	/* clear all entity links */
 	for (i = n - 1; i >= 0; --i) {
 		ent = get_class_member(frame_tp, i);
@@ -64,20 +65,24 @@ 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 {
+	} else {
 		/* use traditionally out edges */
-		if (get_irg_outs_state(irg) != outs_consistent)
-			compute_irg_outs(irg);
+		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);
+			}
 		}
 	}
 
@@ -85,7 +90,8 @@ void opt_frame_irg(ir_graph *irg) {
 	list = NULL;
 	for (i = n - 1; i >= 0; --i) {
 		ent = get_class_member(frame_tp, i);
-		if (get_entity_link(ent) == NULL) {
+		/* 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;
 		}
@@ -100,4 +106,10 @@ void opt_frame_irg(ir_graph *irg) {
 		/* we changed the frame type, it's layout should be redefined */
 		set_type_state(frame_tp, layout_undefined);
 	}
+	irp_free_resources(irp, IR_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);
 }