X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_frame.c;h=c28abd8f12b794ff85bf2c5643a4aa0d015f9fb6;hb=183c08a8d00578cfc700cdd0d8387b920a5996da;hp=5ea1c4589cd86ff10fe74fff40225a4bddcce68b;hpb=1ec30d95387eb392ba5a1adc7958ebd91383d59c;p=libfirm

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index 5ea1c4589..c28abd8f1 100644
--- a/ir/opt/opt_frame.c
+++ b/ir/opt/opt_frame.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,83 +22,96 @@
  * @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.
  */
-#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
  * never touched entities.
  */
-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);
+void opt_frame_irg(ir_graph *irg)
+{
+	ir_type   *frame_tp = get_irg_frame_type(irg);
+	ir_entity *ent, *list;
+	ir_node   *frame, *sel;
+	size_t    i, n = get_class_n_members(frame_tp);
 
-  assert(get_irg_phase_state(irg) == phase_high && "Graph must be in high phase");
-  if (n <= 0)
-    return;
+	if (n <= 0)
+		return;
 
-  /* clear all entity links */
-  for (i = n - 1; i >= 0; --i) {
-    ent = get_class_member(frame_tp, i);
-    set_entity_link(ent, NULL);
-  }
+	irp_reserve_resources(irp, IRP_RESOURCE_ENTITY_LINK);
 
-  /* look for uses */
-  frame = get_irg_frame(irg);
+	/* clear all entity links */
+	for (i = n; i > 0;) {
+		ent = get_class_member(frame_tp, --i);
+		set_entity_link(ent, NULL);
+	}
 
-  if (edges_activated(irg)) { /* use inplace edges */
-    const ir_edge_t *edge;
+	/* look for uses */
+	frame = get_irg_frame(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);
-    }
-  }
-  else {
-    /* use traditionally out edges */
-    if (get_irg_outs_state(irg) != outs_consistent)
-      compute_irg_outs(irg);
+	if (edges_activated(irg)) { /* use inplace edges */
+		const ir_edge_t *edge;
 
-    /* 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);
-    }
-  }
+		/* mark all used entities */
+		foreach_out_edge(frame, edge) {
+			sel = get_edge_src_irn(edge);
+			if (is_Sel(sel)) {
+				ent = get_Sel_entity(sel);
+				set_entity_link(ent, ent);
+			}
+		}
+	} else {
+		int i;
 
-  /* 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) {
-      set_entity_link(ent, list);
-      list = ent;
-    }
-  }
+		/* use traditionally out edges */
+		assure_irg_outs(irg);
 
-  if (list) {
-    /* delete list members */
-    for (ent = list; ent; ent = list) {
-      list = get_entity_link(ent);
-      remove_class_member(frame_tp, ent);
-    }
-    /* we changed the frame type, it's layout should be redefined */
-    set_type_state(frame_tp, layout_undefined);
-  }
+		/* mark all used entities */
+		for (i = get_irn_n_outs(frame) - 1; i >= 0; --i) {
+			sel = get_irn_out(frame, i);
+			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; 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;
+		}
+	}
+
+	if (list != NULL) {
+		/* delete list members */
+		for (ent = list; ent; ent = list) {
+			list = (ir_entity*)get_entity_link(ent);
+			free_entity(ent);
+		}
+		/* we changed the frame type, its layout should be redefined */
+		set_type_state(frame_tp, layout_undefined);
+	}
+	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);
 }