X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_frame.c;h=b9855405750a05a8d7282dc7a2c2b9b0f26444cc;hb=1a4bb21b7aa32f0bcd282d4c1cdb144aca601fa9;hp=0b946597748a723c8b231f4267682ffa16563884;hpb=0d470055af1b3bc6c917e6f004123e5aab47de8f;p=libfirm

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index 0b9465977..b98554057 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-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -26,79 +26,81 @@
  * @summary
  *   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 "opt_frame.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);
+	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);
 
-  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, IR_RESOURCE_ENTITY_LINK);
 
-  /* look for uses */
-  frame = get_irg_frame(irg);
+	/* clear all entity links */
+	for (i = n - 1; i >= 0; --i) {
+		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 {
+		/* use traditionally out edges */
+		assure_irg_outs(irg);
 
-  /* 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;
-    }
-  }
+		/* 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);
+				set_entity_link(ent, ent);
+			}
+		}
+	}
 
-  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);
-  }
+	/* 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;
+		}
+	}
+
+	if (list != NULL) {
+		/* 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);
+	}
+	irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
 }