tested and typo fixed

[r1563]

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index bf480c1..da0cee2 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -2161,24 +2161,6 @@ skip_Tuple (ir_node *node) {
   return node;
 }
 
-#if 1
-INLINE ir_node *
-skip_nop (ir_node *node) {
-  /* don't assert node !!! */
-
-  if (!get_opt_normalize()) return node;
-
-  /* Don't use get_Id_pred:  We get into an endless loop for
-     self-referencing Ids. */
-  if (node && (node->op == op_Id) && (node != node->in[0+1])) {
-    assert (get_irn_arity (node) > 0);
-    return node->in[0+1];
-  } else {
-    return node;
-  }
-}
-#else
-
 /* This should compact Id-cycles to self-cycles. It has the same (or less?) complexity
    than any other approach, as Id chains are resolved and all point to the real node, or
    all id's are self loops. */
@@ -2197,7 +2179,7 @@ skip_nop (ir_node *node) {
     assert (get_irn_arity (node) > 0);
 
     node->in[0+1] = node;
-    res = skip_nop(pred);
+    res = skip_nop(rem_pred);
     if (res->op == op_Id) /* self-loop */ return node;
 
     node->in[0+1] = res;
@@ -2207,8 +2189,6 @@ skip_nop (ir_node *node) {
   }
 }
 
-#endif
-
 INLINE ir_node *
 skip_Id (ir_node *node) {
   return skip_nop(node);