Fixed iterations broken with size_t refactoring.

[libfirm] / ir / lower / lower_mode_b.c

diff --git a/ir/lower/lower_mode_b.c b/ir/lower/lower_mode_b.c
index 00e6e1d..c541e1f 100644 (file)
--- a/ir/lower/lower_mode_b.c
+++ b/ir/lower/lower_mode_b.c
@@ -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.
  *
@@ -149,9 +149,6 @@ ir_node *ir_create_cond_set(ir_node *cond_value, ir_mode *dest_mode)
 
        set_irn_in(lower_block, ARRAY_SIZE(lower_in), lower_in);
        phi = new_r_Phi(lower_block, ARRAY_SIZE(phi_in), phi_in, dest_mode);
-       assert(get_Block_phis(lower_block) == NULL);
-       set_Block_phis(lower_block, phi);
-       set_Phi_next(phi, NULL);
 
        /* make sure we do visit the cond_value later... */
        ARR_APP1(ir_node*, check_later, cond_value);
@@ -161,9 +158,9 @@ ir_node *ir_create_cond_set(ir_node *cond_value, ir_mode *dest_mode)
 
 static void adjust_method_type(ir_type *method_type)
 {
-       int i;
-       int n_params;
-       int n_res;
+       size_t i;
+       size_t n_params;
+       size_t n_res;
 
        n_params = get_method_n_params(method_type);
        for (i = 0; i < n_params; ++i) {
@@ -187,10 +184,9 @@ static ir_node *lower_node(ir_node *node)
        dbg_info *dbgi  = get_irn_dbg_info(node);
        ir_node  *block = get_nodes_block(node);
        ir_mode  *mode  = config->lowered_mode;
+       ir_node  *res   = (ir_node*)get_irn_link(node);
        ir_graph *irg;
-       ir_node  *res;
 
-       res = get_irn_link(node);
        if (res != NULL)
                return res;
 
@@ -428,7 +424,7 @@ static void lower_mode_b_walker(ir_node *node, void *env)
                changed = true;
        }
        if (changed) {
-               bool *global_changed = env;
+               bool *global_changed = (bool*)env;
                *global_changed = true;
                add_identities(node);
        }
@@ -439,8 +435,8 @@ void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig)
        ir_entity *entity  = get_irg_entity(irg);
        ir_type   *type    = get_entity_type(entity);
        bool       changed = false;
-       int        i;
-       int        n;
+       size_t     i;
+       size_t     n;
 
        config        = nconfig;
        lowered_nodes = NEW_ARR_F(ir_node*, 0);
@@ -459,13 +455,12 @@ void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig)
        irg_walk_graph(irg, firm_clear_link, NULL, NULL);
        irg_walk_graph(irg, lower_mode_b_walker, NULL, &changed);
 
-       for (i = 0; i < ARR_LEN(check_later); ++i) {
+       for (i = 0, n = ARR_LEN(check_later); i < n; ++i) {
                ir_node *node = check_later[i];
                irg_walk_core(node, lower_mode_b_walker, NULL, &changed);
        }
 
-       n = ARR_LEN(lowered_nodes);
-       for (i = 0; i < n; ++i) {
+       for (i = 0, n = ARR_LEN(lowered_nodes); i < n; ++i) {
                ir_node *node = lowered_nodes[i];
                maybe_kill_node(node);
        }