- BugFix: not all users of the frame are Sel nodes

[libfirm] / ir / opt / opt_frame.c

diff --git a/ir/opt/opt_frame.c b/ir/opt/opt_frame.c
index 2ce4502..029d009 100644 (file)
--- 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.
  *
@@ -17,95 +17,88 @@
  * PURPOSE.
  */
 
-/*
- * Project:     libFIRM
- * File name:   ir/opt/opt_frame.c
- * Purpose:     optimize the frame type
- * Author:      Michael Beck
- * Created:     15.03.2006
- * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2006 Universität Karlsruhe
- */
-
 /**
- * @file opt_frame.c
- *
- * Optimize the frame type by removing unused type members.
+ * @file
+ * @brief   Optimize the frame type.
+ * @date    15.03.2006
+ * @author  Michael Beck
+ * @version $Id$
+ * @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);
+
+       if (n <= 0)
+               return;
 
-  assert(get_irg_phase_state(irg) == phase_high && "Graph must be in high phase");
-  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);
-    set_entity_link(ent, NULL);
-  }
+       /* clear all entity links */
+       for (i = n - 1; i >= 0; --i) {
+               ent = get_class_member(frame_tp, i);
+               set_entity_link(ent, NULL);
+       }
 
-  /* look for uses */
-  frame = get_irg_frame(irg);
+       /* look for uses */
+       frame = get_irg_frame(irg);
 
-  if (edges_activated(irg)) { /* use inplace edges */
-    const ir_edge_t *edge;
+       if (edges_activated(irg)) { /* use inplace edges */
+               const ir_edge_t *edge;
 
-    /* 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);
+               /* 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 */
+               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);
-    }
-  }
+               /* 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);
+                       }
+               }
+       }
 
-  /* 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;
-    }
-  }
+       /* 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) {
-    /* 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);
-  }
+       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);
 }