more debug info

[libfirm] / ir / opt / condeval.c

diff --git a/ir/opt/condeval.c b/ir/opt/condeval.c
index 3b0029a..7113fd8 100644 (file)
--- a/ir/opt/condeval.c
+++ b/ir/opt/condeval.c
@@ -31,7 +31,7 @@
 #include "iroptimize.h"
 
 #include <assert.h>
-#include "array.h"
+#include "array_t.h"
 #include "debug.h"
 #include "ircons.h"
 #include "irgmod.h"
@@ -90,7 +90,7 @@ static ir_node *search_def_and_create_phis(ir_node *block, ir_mode *mode)
        irg = get_irn_irg(block);
        assert(block != get_irg_start_block(irg));
 
-       /* a Blocks with only 1 predecessor need no Phi */
+       /* a Block with only 1 predecessor needs no Phi */
        n_cfgpreds = get_Block_n_cfgpreds(block);
        if(n_cfgpreds == 1) {
                ir_node *pred_block = get_Block_cfgpred_block(block, 0);
@@ -202,7 +202,7 @@ typedef struct condeval_env_t {
        pn_Cmp         pnc;        /**< The Compare mode of the Compare node. */
        ir_node       *cnst;
        tarval        *tv;
-       unsigned long  visited_nr;
+       ir_visited_t   visited_nr;
 
        ir_node       *cnst_pred;   /**< the block before the constant */
        int            cnst_pos;    /**< the pos to the constant block (needed to
@@ -710,8 +710,7 @@ void opt_cond_eval(ir_graph* irg)
        normalize_proj_nodes(irg);
 
        edges_assure(irg);
-       set_using_irn_link(irg);
-       set_using_irn_visited(irg);
+       ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_IRN_VISITED);
 
        changed = 0;
        do {
@@ -720,8 +719,7 @@ void opt_cond_eval(ir_graph* irg)
                changed |= rerun;
        } while (rerun);
 
-       clear_using_irn_visited(irg);
-       clear_using_irn_link(irg);
+       ir_free_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_IRN_VISITED);
 
        if (changed) {
                /* control flow changed, some blocks may become dead */
@@ -734,5 +732,4 @@ void opt_cond_eval(ir_graph* irg)
                 * to call optimize_df() an dead code. */
                optimize_cf(irg);
        }
-
 }