X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgmod.c;h=9c922421dc62781b62ab5ab48d963539e22f2677;hb=169fd803ea2ed08171113c1fd7ab4e528e1ebc26;hp=39f255c8cf15b8a7cb0a60289253b91fbcef10ba;hpb=9fe9c20a1570729f1bdd21a6f174ec045d2ff986;p=libfirm

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index 39f255c8c..9c922421d 100644
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -1,6 +1,6 @@
 /*
  * Project:     libFIRM
- * File name:   ir/ir/irgmod.h
+ * File name:   ir/ir/irgmod.c
  * Purpose:     Support for ir graph modification.
  * Author:      Martin Trapp, Christian Schaefer
  * Modified by: Goetz Lindenmaier
@@ -14,15 +14,17 @@
 # include "config.h"
 #endif
 
-# include "irvrfy.h"
-# include "irflag_t.h"
-# include "irgwalk.h"
-# include "irnode_t.h"
-# include "irgraph_t.h"
-# include "irgmod.h"
-# include "array.h"
-# include "ircons.h"
-# include "firmstat.h"
+#include "irvrfy.h"
+#include "irflag_t.h"
+#include "irgwalk.h"
+#include "irnode_t.h"
+#include "irgraph_t.h"
+#include "irgmod.h"
+#include "array.h"
+#include "ircons.h"
+#include "irhooks.h"
+#include "iredges_t.h"
+#include "irtools.h"
 
 /* Turns a node into a "useless" Tuple.  The Tuple just forms a tuple
    from several inputs.
@@ -39,6 +41,7 @@ turn_into_tuple (ir_node *node, int arity)
     /* Allocate new array, don't free old in_array, it's on the obstack. */
     ir_node *block = get_nodes_block(node);
     node->in = NEW_ARR_D (ir_node *, current_ir_graph->obst, arity+1);
+		edges_invalidate(node, current_ir_graph);
     set_nodes_block(node, block);
   }
 }
@@ -46,40 +49,50 @@ turn_into_tuple (ir_node *node, int arity)
 /* 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 */
-INLINE void
+void
 exchange (ir_node *old, ir_node *nw)
 {
-  ir_node *block;
-  ir_graph *irg = get_irn_irg (old);
+  /*
+   * If new outs are on, we can skip the id node creation and reroute
+   * the edges from the old node to the new directly.
+   */
+  if (edges_activated(current_ir_graph)) {
+    edges_reroute(old, nw, current_ir_graph);
+  }
+  else {
+    /* Else, do it the old-fashioned way. */
 
-  assert(old != nw);
-  assert (irg);
-  assert(get_irn_op(old)->opar != oparity_dynamic);
+    ir_graph *irg = get_irn_irg (old);
+    ir_node *block;
 
-  stat_turn_into_id(old);
+    assert(old != nw);
+    assert (irg);
+    assert(get_irn_op(old)->opar != oparity_dynamic);
 
-  block = old->in[0];
-  if (!block) {
-    if (is_Block(nw)) block = nw;
-    else (block = nw->in[0]);
-    if (!block) { DDMN(old); DDMN(nw); assert(0 && "cannot find legal block for id"); }
-  }
+    hook_turn_into_id(old);
+
+    block = old->in[0];
+    if (!block) {
+      block = is_Block(nw) ? nw : get_nodes_block(nw);
+
+      if (!block) {
+	DDMN(old);
+	DDMN(nw);
+	assert(0 && "cannot find legal block for id");
+      }
+    }
 
-  old->op = op_Id;
-  old->in = NEW_ARR_D (ir_node *, irg->obst, 2);
-  old->in[0] = block;
-  old->in[1] = nw;
+    old->op = op_Id;
+    old->in = NEW_ARR_D (ir_node *, irg->obst, 2);
+    old->in[0] = block;
+    old->in[1] = nw;
+  }
 }
 
 /*--------------------------------------------------------------------*/
 /*  Functionality for collect_phis                                    */
 /*--------------------------------------------------------------------*/
 
-static void
-clear_link (ir_node *n, void *env) {
-  set_irn_link(n, NULL);
-}
-
 static void
 collect (ir_node *n, void *env) {
   ir_node *pred;
@@ -103,7 +116,7 @@ void collect_phiprojs(ir_graph *irg) {
   rem = current_ir_graph;
   current_ir_graph = irg;
 
-  irg_walk(get_irg_end(current_ir_graph), clear_link, collect, NULL);
+  irg_walk(get_irg_end(current_ir_graph), firm_clear_link, collect, NULL);
 
   current_ir_graph = rem;
 }