Fix fehler171

[libfirm] / ir / be / beschednormal.c

diff --git a/ir/be/beschednormal.c b/ir/be/beschednormal.c
index d505350..46aa21b 100644 (file)
--- a/ir/be/beschednormal.c
+++ b/ir/be/beschednormal.c
@@ -33,7 +33,7 @@
 #include "height.h"
 #include "irtools.h"
 #include "irgwalk.h"
-#include "benode_t.h"
+#include "benode.h"
 #include "array_t.h"
 
 // XXX there is no one time init for schedulers
@@ -154,7 +154,7 @@ static int normal_tree_cost(ir_node* irn, instance_t *inst)
                int            i;
                ir_node*       block = get_nodes_block(irn);
 
-               fc = obstack_alloc(&inst->obst, sizeof(*fc) + sizeof(*fc->costs) * arity);
+               fc = OALLOCF(&inst->obst, flag_and_cost, costs, arity);
                fc->no_root = 0;
                costs = fc->costs;
 
@@ -408,7 +408,7 @@ static void *normal_init_block(void *graph_env, ir_node *block)
           The link field is used anyway. */
        for (i = ARR_LEN(sched) - 1; i >= 0; --i) {
                ir_node* irn = sched[i];
-               if (!arch_irn_class_is(irn, branch)) {
+               if (!is_cfop(irn)) {
                        set_irn_link(irn, first);
                        first = irn;
                }