irgraph: Assert in get_irg_obstack(), that no object is currently growing.

[libfirm] / ir / ir / irgmod.c

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index 514cc49..2a26453 100644 (file)
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -21,7 +21,6 @@
  * @file
  * @brief    Support for ir graph modification.
  * @author   Martin Trapp, Christian Schaefer, Goetz Lindenmaier
- * @version  $Id$
  */
 #include "config.h"
 
@@ -37,12 +36,6 @@
 #include "irtools.h"
 #include "error.h"
 
-/**
- * Turns a node into a "useless" Tuple.  The Tuple just forms a tuple
- * from several inputs.
- * This is useful if a node returning a tuple is removed, but the Projs
- * extracting values from the tuple are not available.
- */
 void turn_into_tuple(ir_node *node, int arity)
 {
        ir_graph *irg = get_irn_irg(node);
@@ -58,11 +51,6 @@ void turn_into_tuple(ir_node *node, int arity)
        set_irn_op(node, op_Tuple);
 }
 
-/**
- * Insert irnode `new' in place of irnode `old'
- * Since `new' may be bigger than `old' replace `old'
- * by an op_Id which is smaller than everything.
- */
 void exchange(ir_node *old, ir_node *nw)
 {
        ir_graph *irg;
@@ -108,19 +96,16 @@ void exchange(ir_node *old, ir_node *nw)
                }
 
                old->op    = op_Id;
-               old->in    = NEW_ARR_D (ir_node *, irg->obst, 2);
+               old->in    = NEW_ARR_D(ir_node*, get_irg_obstack(irg), 2);
                old->in[0] = block;
                old->in[1] = nw;
        }
 
        /* update irg flags */
-       set_irg_outs_inconsistent(irg);
+       clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUTS
+                          | IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO);
 }
 
-/*--------------------------------------------------------------------*/
-/*  Functionality for collect_phis                                    */
-/*--------------------------------------------------------------------*/
-
 /**
  * Walker: links all Phi nodes to their Blocks lists,
  *         all Proj nodes to there predecessors.
@@ -151,10 +136,6 @@ void collect_phiprojs(ir_graph *irg)
        irg_walk_graph(irg, firm_clear_node_and_phi_links, collect_phiprojs_walker, NULL);
 }
 
-/*--------------------------------------------------------------------*/
-/*  Functionality for part_block                                      */
-/*--------------------------------------------------------------------*/
-
 /**
  * Moves node and all predecessors of node from from_bl to to_bl.
  * Does not move predecessors of Phi nodes (or block nodes).
@@ -188,6 +169,20 @@ static void move(ir_node *node, ir_node *from_bl, ir_node *to_bl)
        }
 }
 
+static void move_projs(const ir_node *node, ir_node *to_bl)
+{
+       if (get_irn_mode(node) != mode_T)
+               return;
+
+       foreach_out_edge(node, edge) {
+               ir_node *proj = get_edge_src_irn(edge);
+               if (!is_Proj(proj))
+                       continue;
+               set_nodes_block(proj, to_bl);
+               move_projs(proj, to_bl);
+       }
+}
+
 /**
  * Moves node and all predecessors of node from from_bl to to_bl.
  * Does not move predecessors of Phi nodes (or block nodes).
@@ -200,13 +195,7 @@ static void move_edges(ir_node *node, ir_node *from_bl, ir_node *to_bl)
        set_nodes_block(node, to_bl);
 
        /* move its Projs */
-       if (get_irn_mode(node) == mode_T) {
-               const ir_edge_t *edge;
-               foreach_out_edge(node, edge) {
-                       ir_node *proj = get_edge_src_irn(edge);
-                       set_nodes_block(proj, to_bl);
-               }
-       }
+       move_projs(node, to_bl);
 
        /* We must not move predecessors of Phi nodes, even if they are in
         * from_bl. (because these are values from an earlier loop iteration
@@ -260,13 +249,9 @@ void part_block(ir_node *node)
 
 ir_node *part_block_edges(ir_node *node)
 {
-       ir_graph        *irg       = get_irn_irg(node);
-       ir_node         *old_block = get_nodes_block(node);
-       ir_node         *new_block = new_r_Block(irg,
-                                                get_Block_n_cfgpreds(old_block),
-                                                get_Block_cfgpred_arr(old_block));
-       const ir_edge_t *edge;
-       const ir_edge_t *next;
+       ir_graph *irg       = get_irn_irg(node);
+       ir_node  *old_block = get_nodes_block(node);
+       ir_node  *new_block = new_r_Block(irg, get_Block_n_cfgpreds(old_block), get_Block_cfgpred_arr(old_block));
 
        /* old_block has no predecessors anymore for now */
        set_irn_in(old_block, 0, NULL);
@@ -275,7 +260,7 @@ ir_node *part_block_edges(ir_node *node)
        move_edges(node, old_block, new_block);
 
        /* move Phi nodes to new_block */
-       foreach_out_edge_safe(old_block, edge, next) {
+       foreach_out_edge_safe(old_block, edge) {
                ir_node *phi = get_edge_src_irn(edge);
                if (!is_Phi(phi))
                        continue;