simplify transform_node_Mux by using is_single_bit
[libfirm] / ir / ir / iredges.c
index 7bac22b..799dada 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -23,7 +23,7 @@
  * @author  Sebastian Hack, Michael Beck, Andreas Schoesser
  * @date    14.1.2005
  * @version $Id$
- * @summary
+ * @brief
  *   This are out-edges (also called def-use edges) that are dynamically
  *   updated as the graph changes.
  */
@@ -40,6 +40,7 @@
 #include "set.h"
 #include "bitset.h"
 #include "error.h"
+#include "irpass_t.h"
 
 #include "iredgeset.h"
 #include "hashptr.h"
 #define SetRangeEmpty(ptr,size)   memset(ptr, 0, (size) * sizeof((ptr)[0]))
 
 #define hashset_init            ir_edgeset_init
+void ir_edgeset_init_size(ir_edgeset_t *self, size_t size);
 #define hashset_init_size       ir_edgeset_init_size
 #define hashset_destroy         ir_edgeset_destroy
 #define hashset_insert          ir_edgeset_insert
 #define hashset_remove          ir_edgeset_remove
+ir_edge_t *ir_edgeset_find(const ir_edgeset_t *self, const ir_edge_t*);
 #define hashset_find            ir_edgeset_find
+size_t ir_edgeset_size(const ir_edgeset_t *self);
 #define hashset_size            ir_edgeset_size
 #define hashset_iterator_init   ir_edgeset_iterator_init
 #define hashset_iterator_next   ir_edgeset_iterator_next
  */
 typedef void (set_edge_func_t)(ir_node *src, int pos, ir_node *tgt);
 
+/**
+ * A function that returns the "arity" of a given edge kind
+ * for a node.
+ */
 typedef int (get_edge_src_arity_func_t)(const ir_node *src);
 
+/**
+ * A function that returns the pos'th edge of a given edge kind for a node.
+ */
 typedef ir_node *(get_edge_src_n_func_t)(const ir_node *src, int pos);
 
 /**
@@ -93,9 +104,10 @@ typedef struct {
 /**
  * Get the predecessor block.
  */
-static ir_node *get_block_n(const ir_node *irn, int pos) {
-       if (is_Block(irn))
-               return get_Block_cfgpred_block(irn, pos);
+static ir_node *get_block_n(const ir_node *block, int pos)
+{
+       if (is_Block(block))
+               return get_Block_cfgpred_block(block, pos);
        /* might be a Bad */
        return NULL;
 }
@@ -106,7 +118,7 @@ static const ir_edge_kind_info_t edge_kind_info[EDGE_KIND_LAST] = {
        { "dependency",  set_irn_dep,  0, get_irn_deps,   get_irn_dep }
 };
 
-#define foreach_tgt(irn, i, n, kind) for(i = edge_kind_info[kind].first_idx, n = edge_kind_info[kind].get_arity(irn); i < n; ++i)
+#define foreach_tgt(irn, i, n, kind) for (i = edge_kind_info[kind].first_idx, n = edge_kind_info[kind].get_arity(irn); i < n; ++i)
 #define get_n(irn, pos, kind)        (edge_kind_info[kind].get_n(irn, pos))
 #define get_kind_str(kind)           (edge_kind_info[kind].name)
 
@@ -122,7 +134,7 @@ static int edges_used = 0;
  * Summed size of all users private data
  */
 
-static int edges_private_size = 0;
+static size_t edges_private_size = 0;
 #define EDGE_SIZE (sizeof(ir_edge_t) + edges_private_size)
 
 /**
@@ -130,17 +142,12 @@ static int edges_private_size = 0;
  */
 static int edges_dbg = 0;
 
-#ifdef DEBUG_libfirm
-/* a static variable holding the last number assigned to a new edge */
-static long last_edge_num = -1;
-#endif
-
-static inline long edge_get_id(const ir_edge_t *e) {
-#ifdef DEBUG_libfirm
-       return e->edge_nr;
-#else /* DEBUG_libfirm */
+/**
+ * Returns an ID for the given edge.
+ */
+static inline long edge_get_id(const ir_edge_t *e)
+{
        return (long)e;
-#endif /* DEBUG_libfirm */
 }
 
 /**
@@ -154,8 +161,9 @@ static inline long edge_get_id(const ir_edge_t *e) {
  * Each user has to remember his given offset and the size of his private data.
  * To be called before FIRM is initialized.
  */
-int edges_register_private_data(size_t n) {
-       int res = edges_private_size;
+size_t edges_register_private_data(size_t n)
+{
+       size_t res = edges_private_size;
 
        assert(!edges_used && "you cannot register private edge data, if edges have been initialized");
 
@@ -163,12 +171,13 @@ int edges_register_private_data(size_t n) {
        return res;
 }
 
-/**
+/*
  * Reset the user's private data at offset 'offset'
  * The user has to remember his offset and the size of his data!
  * Caution: Using wrong values here can destroy other users private data!
  */
-void edges_reset_private_data(ir_graph *irg, int offset, size_t size) {
+void edges_reset_private_data(ir_graph *irg, int offset, unsigned size)
+{
        irg_edge_info_t       *info = _get_irg_edge_info(irg, EDGE_KIND_NORMAL);
        ir_edge_t             *edge;
        ir_edgeset_iterator_t  iter;
@@ -188,13 +197,14 @@ void edges_reset_private_data(ir_graph *irg, int offset, size_t size) {
  * Initialize the out information for a graph.
  * @note Dead node elimination can call this on an already initialized graph.
  */
-void edges_init_graph_kind(ir_graph *irg, ir_edge_kind_t kind) {
+void edges_init_graph_kind(ir_graph *irg, ir_edge_kind_t kind)
+{
        if (edges_activated_kind(irg, kind)) {
                irg_edge_info_t *info = _get_irg_edge_info(irg, kind);
                size_t amount = irg->estimated_node_count * 2;
 
                edges_used = 1;
-               if(info->allocated) {
+               if (info->allocated) {
                        amount = ir_edgeset_size(&info->edges);
                        ir_edgeset_destroy(&info->edges);
                        obstack_free(&info->edges_obst, NULL);
@@ -208,14 +218,16 @@ void edges_init_graph_kind(ir_graph *irg, ir_edge_kind_t kind) {
 
 /**
  * Get the edge object of an outgoing edge at a node.
- * @param   irg The graph, the node is in.
- * @param   src The node at which the edge originates.
- * @param   pos The position of the edge.
+ * @param  irg  The graph, the node is in.
+ * @param  src  The node at which the edge originates.
+ * @param  pos  The position of the edge.
+ * @param  kind The kind of the edge.
  * @return      The corresponding edge object or NULL,
  *              if no such edge exists.
  */
-const ir_edge_t *get_irn_edge_kind(ir_graph *irg, const ir_node *src, int pos, ir_edge_kind_t kind)
+const ir_edge_t *get_irn_edge_kind(const ir_node *src, int pos, ir_edge_kind_t kind)
 {
+       ir_graph *irg = get_irn_irg(src);
        if (edges_activated_kind(irg, kind)) {
                irg_edge_info_t *info = _get_irg_edge_info(irg, kind);
                ir_edge_t       key;
@@ -229,53 +241,24 @@ const ir_edge_t *get_irn_edge_kind(ir_graph *irg, const ir_node *src, int pos, i
        return NULL;
 }
 
-/**
- * Get the edge object of an outgoing edge at a node.
- * Looks for an edge for all kinds.
- */
-const ir_edge_t *get_irn_edge(ir_graph *irg, const ir_node *src, int pos) {
-       const ir_edge_t *edge;
-       if((edge = get_irn_edge_kind(irg, src, pos, EDGE_KIND_NORMAL)) == NULL)
-               edge = get_irn_edge_kind(irg, src, pos, EDGE_KIND_BLOCK);
-       return(edge);
-}
-
 /**
  * Change the out count
  *
  * @param tgt  the edge target
  * @param kind the kind of the edge
  */
-static inline void edge_change_cnt(ir_node *tgt, ir_edge_kind_t kind, int ofs) {
+static inline void edge_change_cnt(ir_node *tgt, ir_edge_kind_t kind, int ofs)
+{
        irn_edge_info_t *info = _get_irn_edge_info(tgt, kind);
        info->out_count += ofs;
-
-#if 0
-       assert(info->out_count >= 0);
-       if (info->out_count == 0 && kind == EDGE_KIND_NORMAL) {
-               /* tgt lost it's last user */
-               int i;
-
-               for (i = get_irn_arity(tgt) - 1; i >= -1; --i) {
-                       ir_node *prev = get_irn_n(tgt, i);
-
-                       edges_notify_edge(tgt, i, NULL, prev, current_ir_graph);
-               }
-               for (i = get_irn_deps(tgt) - 1; i >= 0; --i) {
-                       ir_node *prev = get_irn_dep(tgt, i);
-
-                       edges_notify_edge_kind(tgt, i, NULL, prev, EDGE_KIND_DEP, current_ir_graph);
-
-               }
-       }
-#endif
 }
 
 /**
  * Verify the edge list of a node, ie. ensure it's a loop:
  * head -> e_1 -> ... -> e_n -> head
  */
-static inline void vrfy_list_head(ir_node *irn, ir_edge_kind_t kind) {
+static inline void verify_list_head(ir_node *irn, ir_edge_kind_t kind)
+{
        int                    err       = 0;
        int                    num       = 0;
        pset                   *lh_set   = pset_new_ptr(16);
@@ -304,6 +287,23 @@ static inline void vrfy_list_head(ir_node *irn, ir_edge_kind_t kind) {
        assert(err == 0);
 }
 
+void edges_dump_kind(ir_graph *irg, ir_edge_kind_t kind)
+{
+       irg_edge_info_t *info;
+       ir_edgeset_t    *edges;
+       ir_edgeset_iterator_t iter;
+       ir_edge_t      *e;
+
+       if (!edges_activated_kind(irg, kind))
+               return;
+
+       info  = _get_irg_edge_info(irg, kind);
+       edges = &info->edges;
+       foreach_ir_edgeset(edges, e, iter) {
+               ir_printf("%+F %d %d\n", e->src, e->pos, e->invalid);
+       }
+}
+
 /* The edge from (src, pos) -> old_tgt is redirected to tgt */
 void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt,
                             ir_node *old_tgt, ir_edge_kind_t kind,
@@ -313,7 +313,6 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt,
        irg_edge_info_t *info;
        ir_edgeset_t    *edges;
        ir_edge_t        templ;
-       ir_edge_t       *edge;
 
        assert(edges_activated_kind(irg, kind));
 
@@ -335,7 +334,7 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt,
         */
        if (tgt == NULL) {
                /* search the edge in the set. */
-               edge = ir_edgeset_find(edges, &templ);
+               ir_edge_t *edge = ir_edgeset_find(edges, &templ);
 
                /* mark the edge invalid if it was found */
                if (edge) {
@@ -346,9 +345,6 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt,
                        edge->invalid = 1;
                        edge->pos = -2;
                        edge->src = NULL;
-#ifdef DEBUG_libfirm
-                       edge->edge_nr = -1;
-#endif /* DEBUG_libfirm */
                        edge_change_cnt(old_tgt, kind, -1);
                } else {
                        /* If the edge was not found issue a warning on the debug stream */
@@ -368,7 +364,7 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt,
 
                /* If the old target is not null, the edge is moved. */
                if (old_tgt) {
-                       edge = ir_edgeset_find(edges, &templ);
+                       ir_edge_t *edge = ir_edgeset_find(edges, &templ);
                        assert(edge && "edge to redirect not found!");
                        assert(! edge->invalid && "Invalid edge encountered");
 
@@ -382,7 +378,7 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt,
                        ir_edge_t *edge;
 
                        if (list_empty(&info->free_edges)) {
-                               edge = obstack_alloc(&info->edges_obst, EDGE_SIZE);
+                               edge = (ir_edge_t*)obstack_alloc(&info->edges_obst, EDGE_SIZE);
                        } else {
                                edge = list_entry(info->free_edges.next, ir_edge_t, list);
                                list_del(&edge->list);
@@ -395,8 +391,7 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt,
                        edge->kind      = kind;
                        edge->list.next = NULL;
                        edge->list.prev = NULL;
-                       memset(((char*)edge) + sizeof(ir_edge_t), 0, edges_private_size);
-                       DEBUG_ONLY(edge->src_nr = get_irn_node_nr(src));
+                       memset(edge + 1, 0, edges_private_size);
 
                        new_edge = ir_edgeset_insert(edges, edge);
                        if (new_edge != edge) {
@@ -405,7 +400,6 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt,
 
                        msg = "adding";
                        list_add(&edge->list, head);
-                       DEBUG_ONLY(edge->edge_nr = ++last_edge_num);
                }
 
                edge_change_cnt(tgt, kind, +1);
@@ -415,32 +409,44 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt,
        /* verify list heads */
        if (edges_dbg) {
                if (tgt)
-                       vrfy_list_head(tgt, kind);
+                       verify_list_head(tgt, kind);
                if (old_tgt)
-                       vrfy_list_head(old_tgt, kind);
+                       verify_list_head(old_tgt, kind);
        }
 #endif
 
        DBG((dbg, LEVEL_5, "announce out edge: %+F %d-> %+F(%+F): %s\n", src, pos, tgt, old_tgt, msg));
 }
 
-void edges_notify_edge(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt, ir_graph *irg)
+void edges_notify_edge(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt,
+                       ir_graph *irg)
 {
        if (edges_activated_kind(irg, EDGE_KIND_NORMAL)) {
                edges_notify_edge_kind(src, pos, tgt, old_tgt, EDGE_KIND_NORMAL, irg);
        }
 
-       if (edges_activated_kind(irg, EDGE_KIND_BLOCK) && is_Block(src)) {
-               if (pos == -1) {
-                       /* a MacroBlock edge: ignore it here */
-               } else {
-                       ir_node *bl_old = old_tgt ? get_nodes_block(skip_Proj(old_tgt)) : NULL;
+       if (edges_activated_kind(irg, EDGE_KIND_BLOCK)) {
+               if (is_Block(src)) {
+                       ir_node *bl_old = old_tgt ? get_nodes_block(old_tgt) : NULL;
                        ir_node *bl_tgt = NULL;
 
                        if (tgt)
-                               bl_tgt = is_Bad(tgt) ? tgt : get_nodes_block(skip_Proj(tgt));
+                               bl_tgt = is_Bad(tgt) ? tgt : get_nodes_block(tgt);
 
                        edges_notify_edge_kind(src, pos, bl_tgt, bl_old, EDGE_KIND_BLOCK, irg);
+               } else if (get_irn_mode(src) == mode_X && old_tgt != NULL && is_Block(old_tgt)) {
+                       /* moving a jump node from one block to another */
+                       const ir_edge_t *edge;
+                       const ir_edge_t *next;
+                       foreach_out_edge_kind_safe(old_tgt, edge, next, EDGE_KIND_BLOCK) {
+                               ir_node *succ       = get_edge_src_irn(edge);
+                               int      succ_pos   = get_edge_src_pos(edge);
+                               ir_node *block_pred = get_Block_cfgpred(succ, succ_pos);
+                               if (block_pred != src)
+                                       continue;
+                               edges_notify_edge_kind(succ, succ_pos, tgt, old_tgt,
+                                                      EDGE_KIND_BLOCK, irg);
+                       }
                }
        }
 }
@@ -452,9 +458,10 @@ void edges_notify_edge(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt, ir
  * @param kind  the kind of edges to remove
  * @param irg   the irg of the old node
  */
-static void edges_node_deleted_kind(ir_node *old, ir_edge_kind_t kind, ir_graph *irg)
+static void edges_node_deleted_kind(ir_node *old, ir_edge_kind_t kind)
 {
        int i, n;
+       ir_graph *irg = get_irn_irg(old);
 
        if (!edges_activated_kind(irg, kind))
                return;
@@ -467,40 +474,70 @@ static void edges_node_deleted_kind(ir_node *old, ir_edge_kind_t kind, ir_graph
        }
 }
 
-struct build_walker {
-       ir_graph       *irg;
+/**
+ * A node might be revivaled by CSE. Assure its edges.
+ *
+ * @param irn   the node
+ * @param kind  the kind of edges to remove
+ * @param irg   the irg of the old node
+ */
+static void edges_node_revival_kind(ir_node *irn, ir_edge_kind_t kind)
+{
+       irn_edge_info_t *info;
+       int             i, n;
+       ir_graph        *irg = get_irn_irg(irn);
+
+       if (!edges_activated_kind(irg, kind))
+               return;
+
+       info = _get_irn_edge_info(irn, kind);
+       if (info->edges_built)
+               return;
+
+       DBG((dbg, LEVEL_5, "node revivaled (kind: %s): %+F\n", get_kind_str(kind), irn));
+
+       foreach_tgt(irn, i, n, kind) {
+               ir_node *tgt = get_n(irn, i, kind);
+               edges_notify_edge_kind(irn, i, tgt, NULL, kind, irg);
+       }
+       info->edges_built = 1;
+}
+
+typedef struct build_walker {
        ir_edge_kind_t kind;
        bitset_t       *reachable;
        unsigned       problem_found;
-};
+} build_walker;
 
 /**
  * Post-Walker: notify all edges
  */
-static void build_edges_walker(ir_node *irn, void *data) {
-       struct build_walker   *w = data;
+static void build_edges_walker(ir_node *irn, void *data)
+{
+       build_walker          *w = (build_walker*)data;
        int                   i, n;
        ir_edge_kind_t        kind = w->kind;
-       ir_graph              *irg = w->irg;
-       get_edge_src_n_func_t *get_n;
+       ir_graph              *irg = get_irn_irg(irn);
 
-       get_n = edge_kind_info[kind].get_n;
        foreach_tgt(irn, i, n, kind) {
                ir_node *pred = get_n(irn, i, kind);
                edges_notify_edge_kind(irn, i, pred, NULL, kind, irg);
        }
+       _get_irn_edge_info(irn, kind)->edges_built = 1;
 }
 
 /**
  * Pre-Walker: initializes the list-heads and set the out-count
  * of all nodes to 0.
  */
-static void init_lh_walker(ir_node *irn, void *data) {
-       struct build_walker *w   = data;
-       ir_edge_kind_t      kind = w->kind;
-       list_head           *head = _get_irn_outs_head(irn, kind);
+static void init_lh_walker(ir_node *irn, void *data)
+{
+       build_walker   *w    = (build_walker*)data;
+       ir_edge_kind_t  kind = w->kind;
+       list_head      *head = _get_irn_outs_head(irn, kind);
        INIT_LIST_HEAD(head);
-       _get_irn_edge_info(irn, kind)->out_count = 0;
+       _get_irn_edge_info(irn, kind)->edges_built = 0;
+       _get_irn_edge_info(irn, kind)->out_count   = 0;
 }
 
 /**
@@ -514,14 +551,16 @@ static void init_lh_walker(ir_node *irn, void *data) {
  * b) it might be sufficient to add those stupid NO_REG nodes
  * to the anchor
  */
-static void init_lh_walker_dep(ir_node *irn, void *data) {
-       struct build_walker *w   = data;
-       ir_edge_kind_t      kind = w->kind;
-       list_head           *head = _get_irn_outs_head(irn, kind);
-       int                 i;
+static void init_lh_walker_dep(ir_node *irn, void *data)
+{
+       build_walker   *w    = (build_walker*)data;
+       ir_edge_kind_t  kind = w->kind;
+       list_head      *head = _get_irn_outs_head(irn, kind);
+       int             i;
 
        INIT_LIST_HEAD(head);
-       _get_irn_edge_info(irn, kind)->out_count = 0;
+       _get_irn_edge_info(irn, kind)->edges_built = 0;
+       _get_irn_edge_info(irn, kind)->out_count   = 0;
 
        for (i = get_irn_deps(irn) - 1; i >= 0; --i) {
                ir_node *dep = get_irn_dep(irn, i);
@@ -529,7 +568,8 @@ static void init_lh_walker_dep(ir_node *irn, void *data) {
                head = _get_irn_outs_head(dep, kind);
 
                INIT_LIST_HEAD(head);
-               _get_irn_edge_info(dep, kind)->out_count = 0;
+               _get_irn_edge_info(dep, kind)->edges_built = 0;
+               _get_irn_edge_info(dep, kind)->out_count   = 0;
        }
 }
 
@@ -542,11 +582,16 @@ typedef struct visitor_info_t {
  * Visitor: initializes the list-heads and set the out-count
  * of all nodes to 0 of nodes that are not seen so far.
  */
-static void visitor(ir_node *irn, void *data) {
-       visitor_info_t *info = data;
+static void visitor(ir_node *irn, void *data)
+{
+       visitor_info_t *info = (visitor_info_t*)data;
 
-       if (!irn_visited(irn)) {
-               mark_irn_visited(irn);
+       if (is_Deleted(irn))
+               return;
+       if (!is_Block(irn) && is_Deleted(get_nodes_block(irn)))
+               return;
+
+       if (!irn_visited_else_mark(irn)) {
                info->visit(irn, info->data);
        }
 }
@@ -579,7 +624,6 @@ void edges_activate_kind(ir_graph *irg, ir_edge_kind_t kind)
        irg_edge_info_t     *info = _get_irg_edge_info(irg, kind);
        visitor_info_t      visit;
 
-       w.irg  = irg;
        w.kind = kind;
 
        visit.data = &w;
@@ -626,11 +670,12 @@ int (edges_activated_kind)(const ir_graph *irg, ir_edge_kind_t kind)
  *             sent to.
  * @param irg  The graph.
  */
-void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind, ir_graph *irg)
+void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind)
 {
+       ir_graph *irg = get_irn_irg(from);
        set_edge_func_t *set_edge = edge_kind_info[kind].set_edge;
 
-       if(set_edge && edges_activated_kind(irg, kind)) {
+       if (set_edge && edges_activated_kind(irg, kind)) {
                struct list_head *head = _get_irn_outs_head(from, kind);
 
                DBG((dbg, LEVEL_5, "reroute from %+F to %+F\n", from, to));
@@ -645,8 +690,9 @@ void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind, ir_grap
 
 static void verify_set_presence(ir_node *irn, void *data)
 {
-       struct build_walker *w     = data;
-       ir_edgeset_t        *edges = &_get_irg_edge_info(w->irg, w->kind)->edges;
+       build_walker *w     = (build_walker*)data;
+       ir_graph     *irg   = get_irn_irg(irn);
+       ir_edgeset_t *edges = &_get_irg_edge_info(irg, w->kind)->edges;
        int i, n;
 
        foreach_tgt(irn, i, n, w->kind) {
@@ -656,37 +702,29 @@ static void verify_set_presence(ir_node *irn, void *data)
                templ.pos = i;
 
                e = ir_edgeset_find(edges, &templ);
-               if(e != NULL) {
+               if (e != NULL) {
                        e->present = 1;
                } else {
                        w->problem_found = 1;
-#if 0
-                       ir_fprintf(stderr, "Edge Verifier: edge %+F,%d -> %+F (kind: \"%s\") is missing\n",
-                               irn, i, get_n(irn, i, w->kind), get_kind_str(w->kind));
-#endif
                }
        }
 }
 
 static void verify_list_presence(ir_node *irn, void *data)
 {
-       struct build_walker *w = data;
-       const ir_edge_t     *e;
+       build_walker    *w = (build_walker*)data;
+       const ir_edge_t *e;
 
        bitset_set(w->reachable, get_irn_idx(irn));
 
        /* check list heads */
-       vrfy_list_head(irn, w->kind);
+       verify_list_head(irn, w->kind);
 
        foreach_out_edge_kind(irn, e, w->kind) {
                ir_node *tgt;
 
                if (w->kind == EDGE_KIND_NORMAL && get_irn_arity(e->src) <= e->pos) {
                        w->problem_found = 1;
-#if 0
-                       ir_fprintf(stderr, "Edge Verifier: edge(%ld) %+F -> %+F recorded at src position %d, but src has arity %d\n",
-                               edge_get_id(e), e->src, irn, e->pos, get_irn_arity(e->src));
-#endif
                        continue;
                }
 
@@ -694,10 +732,6 @@ static void verify_list_presence(ir_node *irn, void *data)
 
                if (irn != tgt) {
                        w->problem_found = 1;
-#if 0
-                       ir_fprintf(stderr, "Edge Verifier: edge(%ld) %+F,%d (kind \"%s\") is no out edge of %+F but of %+F\n",
-                               edge_get_id(e), e->src, e->pos, get_kind_str(w->kind), irn, tgt);
-#endif
                }
        }
 }
@@ -709,7 +743,6 @@ int edges_verify_kind(ir_graph *irg, ir_edge_kind_t kind)
        ir_edge_t           *e;
        ir_edgeset_iterator_t  iter;
 
-       w.irg           = irg;
        w.kind          = kind;
        w.reachable     = bitset_alloca(get_irg_last_idx(irg));
        w.problem_found = 0;
@@ -741,31 +774,35 @@ int edges_verify_kind(ir_graph *irg, ir_edge_kind_t kind)
 /**
  * Clear link field of all nodes.
  */
-static void clear_links(ir_node *irn, void *env) {
-       struct build_walker *w  = env;
-       bitset_t            *bs;
+static void clear_links(ir_node *irn, void *env)
+{
+       bitset_t     *bs;
+       ir_graph     *irg;
+       (void) env;
 
        if (IGNORE_NODE(irn)) {
                set_irn_link(irn, NULL);
                return;
        }
 
-       bs = bitset_malloc(get_irg_last_idx(w->irg));
+       irg = get_irn_irg(irn);
+       bs  = bitset_malloc(get_irg_last_idx(irg));
        set_irn_link(irn, bs);
 }
 
 /**
  * Increases count (stored in link field) for all operands of a node.
  */
-static void count_user(ir_node *irn, void *env) {
+static void count_user(ir_node *irn, void *env)
+{
        int i;
        int first;
        (void) env;
 
-       first = -1;
+       first = is_Block(irn) ? 0 : -1;
        for (i = get_irn_arity(irn) - 1; i >= first; --i) {
                ir_node  *op = get_irn_n(irn, i);
-               bitset_t *bs = get_irn_link(op);
+               bitset_t *bs = (bitset_t*)get_irn_link(op);
 
                if (bs)
                        bitset_set(bs, get_irn_idx(irn));
@@ -775,20 +812,22 @@ static void count_user(ir_node *irn, void *env) {
 /**
  * Verifies if collected count, number of edges in list and stored edge count are in sync.
  */
-static void verify_edge_counter(ir_node *irn, void *env) {
-       struct build_walker    *w = env;
+static void verify_edge_counter(ir_node *irn, void *env)
+{
+       build_walker           *w = (build_walker*)env;
        bitset_t               *bs;
        int                    list_cnt;
        int                    ref_cnt;
        int                    edge_cnt;
-       unsigned long          idx;
+       size_t                 idx;
        const struct list_head *head;
        const struct list_head *pos;
+       ir_graph               *irg;
 
        if (IGNORE_NODE(irn))
                return;
 
-       bs       = get_irn_link(irn);
+       bs       = (bitset_t*)get_irn_link(irn);
        list_cnt = 0;
        ref_cnt  = 0;
        edge_cnt = _get_irn_edge_info(irn, EDGE_KIND_NORMAL)->out_count;
@@ -801,10 +840,11 @@ static void verify_edge_counter(ir_node *irn, void *env) {
 
        /* check all nodes that reference us and count edges that point number
         * of ins that actually point to us */
+       irg = get_irn_irg(irn);
        ref_cnt = 0;
        bitset_foreach(bs, idx) {
                int i, arity;
-               ir_node *src = get_idx_irn(w->irg, idx);
+               ir_node *src = get_idx_irn(irg, idx);
 
                arity = get_irn_arity(src);
                for (i = 0; i < arity; ++i) {
@@ -824,26 +864,6 @@ static void verify_edge_counter(ir_node *irn, void *env) {
                w->problem_found = 1;
                ir_fprintf(stderr, "Edge Verifier: %+F reachable by %d node(s), but the list contains %d edge(s)\n",
                        irn, ref_cnt, list_cnt);
-
-               /* Matze: buggy if a node has multiple ins pointing at irn */
-#if 0
-               list_for_each(pos, head) {
-                       ir_edge_t *edge = list_entry(pos, ir_edge_t, list);
-                       bitset_flip(bs, get_irn_idx(edge->src));
-               }
-
-               if (ref_cnt < list_cnt)
-                       fprintf(stderr,"               following nodes are recorded in list, but not as user:\n");
-               else
-                       fprintf(stderr,"               following nodes are user, but not recorded in list:\n");
-
-               fprintf(stderr,"              ");
-               bitset_foreach(bs, idx) {
-                       ir_node *src = get_idx_irn(w->irg, idx);
-                       ir_fprintf(stderr, " %+F", src);
-               }
-               fprintf(stderr, "\n");
-#endif
        }
 
        bitset_free(bs);
@@ -852,14 +872,14 @@ static void verify_edge_counter(ir_node *irn, void *env) {
 /**
  * Verifies the out edges of an irg.
  */
-int edges_verify(ir_graph *irg) {
+int edges_verify(ir_graph *irg)
+{
        struct build_walker w;
        int    problem_found = 0;
 
        /* verify normal edges only */
        problem_found  = edges_verify_kind(irg, EDGE_KIND_NORMAL);
 
-       w.irg           = irg;
        w.kind          = EDGE_KIND_NORMAL;
        w.problem_found = 0;
 
@@ -870,23 +890,59 @@ int edges_verify(ir_graph *irg) {
        return problem_found ? 1 : w.problem_found;
 }
 
-void init_edges(void) {
+typedef struct pass_t {
+       ir_graph_pass_t pass;
+       unsigned        assert_on_problem;
+} pass_t;
+
+/**
+ * Wrapper to edges_verify to be run as an ir_graph pass.
+ */
+static int edges_verify_wrapper(ir_graph *irg, void *context)
+{
+       pass_t *pass           = (pass_t*)context;
+       int     problems_found = edges_verify(irg);
+       /* do NOT rerun the pass if verify is ok :-) */
+       assert(problems_found && pass->assert_on_problem);
+       return 0;
+}
+
+/* Creates an ir_graph pass for edges_verify(). */
+ir_graph_pass_t *irg_verify_edges_pass(const char *name, unsigned assert_on_problem)
+{
+       pass_t *pass = XMALLOCZ(pass_t);
+
+       def_graph_pass_constructor(
+               &pass->pass, name ? name : "edges_verify", edges_verify_wrapper);
+
+       /* neither dump nor verify */
+       pass->pass.dump_irg   = (DUMP_ON_IRG_FUNC)ir_prog_no_dump;
+       pass->pass.verify_irg = (RUN_ON_IRG_FUNC)ir_prog_no_verify;
+
+       pass->assert_on_problem = assert_on_problem;
+       return &pass->pass;
+}
+
+void init_edges(void)
+{
        FIRM_DBG_REGISTER(dbg, DBG_EDGES);
-       /* firm_dbg_set_mask(dbg, -1); */
 }
 
-void edges_init_dbg(int do_dbg) {
+void edges_init_dbg(int do_dbg)
+{
        edges_dbg = do_dbg;
 }
 
-void edges_activate(ir_graph *irg) {
+void edges_activate(ir_graph *irg)
+{
        edges_activate_kind(irg, EDGE_KIND_NORMAL);
        edges_activate_kind(irg, EDGE_KIND_BLOCK);
        if (get_irg_phase_state(irg) == phase_backend)
                edges_activate_kind(irg, EDGE_KIND_DEP);
 }
 
-void edges_deactivate(ir_graph *irg) {
+void edges_deactivate(ir_graph *irg)
+{
        if (get_irg_phase_state(irg) == phase_backend)
                edges_deactivate_kind(irg, EDGE_KIND_DEP);
        edges_deactivate_kind(irg, EDGE_KIND_BLOCK);
@@ -911,7 +967,8 @@ int edges_assure(ir_graph *irg)
        return activated;
 }
 
-int edges_assure_kind(ir_graph *irg, ir_edge_kind_t kind) {
+int edges_assure_kind(ir_graph *irg, ir_edge_kind_t kind)
+{
        int activated = edges_activated_kind(irg, kind);
 
        if (!activated)
@@ -920,47 +977,83 @@ int edges_assure_kind(ir_graph *irg, ir_edge_kind_t kind) {
        return activated;
 }
 
-void edges_node_deleted(ir_node *irn, ir_graph *irg) {
-       edges_node_deleted_kind(irn, EDGE_KIND_NORMAL, irg);
-       edges_node_deleted_kind(irn, EDGE_KIND_BLOCK, irg);
+void edges_node_deleted(ir_node *irn)
+{
+       edges_node_deleted_kind(irn, EDGE_KIND_NORMAL);
+       edges_node_deleted_kind(irn, EDGE_KIND_BLOCK);
 }
 
+void edges_node_revival(ir_node *irn)
+{
+       edges_node_revival_kind(irn, EDGE_KIND_NORMAL);
+       edges_node_revival_kind(irn, EDGE_KIND_BLOCK);
+}
 
-const ir_edge_t *(get_irn_out_edge_first_kind)(const ir_node *irn, ir_edge_kind_t kind) {
+const ir_edge_t *(get_irn_out_edge_first_kind)(const ir_node *irn, ir_edge_kind_t kind)
+{
        return _get_irn_out_edge_first_kind(irn, kind);
 }
 
-const ir_edge_t *(get_irn_out_edge_next)(const ir_node *irn, const ir_edge_t *last) {
+const ir_edge_t *(get_irn_out_edge_next)(const ir_node *irn, const ir_edge_t *last)
+{
        return _get_irn_out_edge_next(irn, last);
 }
 
-ir_node *(get_edge_src_irn)(const ir_edge_t *edge) {
+ir_node *(get_edge_src_irn)(const ir_edge_t *edge)
+{
        return _get_edge_src_irn(edge);
 }
 
-int (get_edge_src_pos)(const ir_edge_t *edge) {
+int (get_edge_src_pos)(const ir_edge_t *edge)
+{
        return _get_edge_src_pos(edge);
 }
 
-int (get_irn_n_edges_kind)(const ir_node *irn, ir_edge_kind_t kind) {
+int (get_irn_n_edges_kind)(const ir_node *irn, ir_edge_kind_t kind)
+{
        return _get_irn_n_edges_kind(irn, kind);
 }
 
-void dump_all_out_edges(ir_node *irn) {
-       int i;
-       for (i = 0; i < EDGE_KIND_LAST; ++i) {
-               const ir_edge_t *edge;
+static void irg_walk_edges2(ir_node *node, irg_walk_func *pre,
+                            irg_walk_func *post, void *env)
+{
+       const ir_edge_t *edge, *next;
 
-               printf("kind \"%s\"\n", get_kind_str(i));
-               foreach_out_edge_kind(irn, edge, i) {
-                       ir_printf("\t%+F(%d)\n", edge->src, edge->pos);
-               }
+       if (irn_visited_else_mark(node))
+               return;
+
+       if (pre != NULL)
+               pre(node, env);
+
+       foreach_out_edge_kind_safe(node, edge, next, EDGE_KIND_NORMAL) {
+               /* find the corresponding successor block. */
+               ir_node *pred = get_edge_src_irn(edge);
+               irg_walk_edges2(pred, pre, post, env);
        }
+
+       if (post != NULL)
+               post(node, env);
+}
+
+void irg_walk_edges(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
+                    void *env)
+{
+       ir_graph *irg = get_irn_irg(node);
+
+       assert(edges_activated(irg));
+       assert(is_Block(node));
+
+       ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
+
+       inc_irg_visited(irg);
+       irg_walk_edges2(node, pre, post, env);
+
+       ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 }
 
-static void irg_block_edges_walk2(ir_node *bl,
-                                irg_walk_func *pre, irg_walk_func *post,
-                                void *env) {
+static void irg_block_edges_walk2(ir_node *bl, irg_walk_func *pre,
+                                  irg_walk_func *post, void *env)
+{
        const ir_edge_t *edge, *next;
 
        if (!Block_block_visited(bl)) {
@@ -980,17 +1073,18 @@ static void irg_block_edges_walk2(ir_node *bl,
        }
 }
 
-void irg_block_edges_walk(ir_node *node,
-                          irg_walk_func *pre, irg_walk_func *post,
-                          void *env) {
+void irg_block_edges_walk(ir_node *node, irg_walk_func *pre,
+                          irg_walk_func *post, void *env)
+{
+       ir_graph *irg = get_irn_irg(node);
 
-       assert(edges_activated(current_ir_graph));
+       assert(edges_activated(irg));
        assert(is_Block(node));
 
-       ir_reserve_resources(current_ir_graph, IR_RESOURCE_BLOCK_VISITED);
+       ir_reserve_resources(irg, IR_RESOURCE_BLOCK_VISITED);
 
-       inc_irg_block_visited(current_ir_graph);
+       inc_irg_block_visited(irg);
        irg_block_edges_walk2(node, pre, post, env);
 
-       ir_free_resources(current_ir_graph, IR_RESOURCE_BLOCK_VISITED);
+       ir_free_resources(irg, IR_RESOURCE_BLOCK_VISITED);
 }