rebuild edges after backend transform phase

[libfirm] / ir / be / beverify.c

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index e6c2007..6f34c29 100644 (file)
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -217,6 +217,7 @@ static int should_be_scheduled(ir_node *node) {
        case iro_End:
        case iro_NoMem:
        case iro_Bad:
+       case iro_Unknown:
                return 0;
        default:
                break;
@@ -621,6 +622,9 @@ static void check_register_constraints(ir_node *node, be_verify_register_allocat
        for (i = 0; i < arity; ++i) {
                ir_node *pred = get_irn_n(node, i);
 
+               if (is_Unknown(pred))
+                       continue;
+
                if (is_Bad(pred)) {
                        ir_fprintf(stderr, "Verify warning: %+F in block %+F(%s) has Bad as input %d\n",
                                node, get_nodes_block(node), get_irg_dump_name(env->irg), i);
@@ -737,27 +741,28 @@ int be_verify_register_allocation(const arch_env_t *arch_env, ir_graph *irg) {
 typedef struct _verify_out_dead_nodes_env {
        ir_graph *irg;
        bitset_t *reachable;
-       bitset_t *visited;
        int problem_found;
 } verify_out_dead_nodes_env;
 
 static void check_out_edges(ir_node *node, verify_out_dead_nodes_env *env) {
+       ir_graph *irg = env->irg;
        const ir_edge_t* edge;
 
+       if(irn_visited(node))
+               return;
+       mark_irn_visited(node);
+
        foreach_out_edge(node, edge) {
                ir_node* src = get_edge_src_irn(edge);
 
-               if(!bitset_is_set(env->reachable, get_irn_idx(src))) {
+               if(!bitset_is_set(env->reachable, get_irn_idx(src)) && !is_Block(node)) {
                        ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) only reachable through out edges from %+F\n",
-                                  src, get_nodes_block(src), get_irg_dump_name(env->irg), node);
+                                  src, get_nodes_block(src), get_irg_dump_name(irg), node);
                        env->problem_found = 1;
+                       continue;
                }
 
-               if(!bitset_is_set(env->visited, get_irn_idx(src))) {
-                       bitset_set(env->visited, get_irn_idx(src));
-                       if(!is_Block(src))
-                               check_out_edges(src, env);
-               }
+               check_out_edges(src, env);
        }
 }
 
@@ -769,13 +774,15 @@ static void set_reachable(ir_node *node, void* data)
 
 int be_verify_out_edges(ir_graph *irg) {
        verify_out_dead_nodes_env env;
-       env.irg = irg;
-       env.reachable = bitset_alloca(get_irg_last_idx(irg));
-       env.visited = bitset_alloca(get_irg_last_idx(irg));
-       env.problem_found = 0;
 
-       irg_walk_graph(irg, set_reachable, NULL, env.reachable);
+       env.irg           = irg;
+       env.reachable     = bitset_alloca(get_irg_last_idx(irg));
+       env.problem_found = edges_verify(irg);
+
+       irg_walk_in_or_dep_graph(irg, set_reachable, NULL, env.reachable);
+       irg_walk_anchors(irg, set_reachable, NULL, env.reachable);
+       inc_irg_visited(irg);
        check_out_edges(get_irg_start(irg), &env);
 
-       return !env.problem_found;
+       return ! env.problem_found;
 }