rename Free argument from size to count to be consistent with Alloc

[libfirm] / ir / lower / lower_mode_b.c

diff --git a/ir/lower/lower_mode_b.c b/ir/lower/lower_mode_b.c
index 18916a5..6a381be 100644 (file)
--- a/ir/lower/lower_mode_b.c
+++ b/ir/lower/lower_mode_b.c
@@ -32,7 +32,7 @@
  *   - The only nodes producing mode_b are: Proj(Cmp) and ConvB(X) (where X
  *     is some mode that can be converted to the lowered mode).
  *     ConvB will usually be implemented by a comparison with 0 producing some
- *     flags in the backends. It's debatable wether ConvB(X) is a goode idea.
+ *     flags in the backends. It's debatable whether ConvB(X) is a good idea.
  *     Maybe we should rather introduce a Test node.
  * All other former uses should be converted to manipulations with an integer
  * mode that was specified in the pass configuration.
@@ -69,23 +69,10 @@ static ir_node                    **check_later;
  */
 static void maybe_kill_node(ir_node *node)
 {
-       ir_graph *irg;
-       int       i, arity;
-
        if (get_irn_n_edges(node) != 0)
                return;
 
-       irg = get_irn_irg(node);
-
-       assert(!is_Bad(node));
-
-       arity = get_irn_arity(node);
-       for (i = 0; i < arity; ++i) {
-               set_irn_n(node, i, new_r_Bad(irg));
-       }
-       set_nodes_block(node, new_r_Bad(irg));
-
-       edges_node_deleted(node, irg);
+       kill_node(node);
 }
 
 static ir_node *create_not(dbg_info *dbgi, ir_node *node)
@@ -190,6 +177,8 @@ static ir_node *lower_node(ir_node *node)
        if (res != NULL)
                return res;
 
+       node = skip_Tuple(node);
+
        assert(get_irn_mode(node) == mode_b);
 
        irg = get_irn_irg(node);
@@ -215,10 +204,10 @@ static ir_node *lower_node(ir_node *node)
                ARR_APP1(ir_node*, lowered_nodes, node);
 
                for (i = 0; i < arity; ++i) {
-                       ir_node *in     = get_irn_n(node, i);
-                       ir_node *low_in = lower_node(in);
+                       ir_node *in         = get_irn_n(node, i);
+                       ir_node *lowered_in = is_Bad(in) ? in : lower_node(in);
 
-                       set_irn_n(new_phi, i, low_in);
+                       set_irn_n(new_phi, i, lowered_in);
                }
 
                return new_phi;
@@ -278,14 +267,14 @@ static ir_node *lower_node(ir_node *node)
        }
 
        case iro_Cmp: {
-               ir_node *left  = get_Cmp_left(node);
-               ir_node *right = get_Cmp_right(node);
-               ir_mode *cmp_mode  = get_irn_mode(left);
+               ir_node    *left     = get_Cmp_left(node);
+               ir_node    *right    = get_Cmp_right(node);
+               ir_mode    *cmp_mode = get_irn_mode(left);
+               ir_relation relation = get_Cmp_relation(node);
 
                if ((mode_is_int(cmp_mode) || mode_is_reference(cmp_mode)) &&
                        (get_mode_size_bits(cmp_mode) < get_mode_size_bits(mode) ||
-                       (mode_is_signed(cmp_mode) && is_Const(right) && is_Const_null(right)))) {
-                       ir_relation relation = get_Cmp_relation(node);
+                       (mode_is_signed(cmp_mode) && is_Const(right) && is_Const_null(right) && relation != ir_relation_greater))) {
                        int         need_not = 0;
                        ir_node    *a        = NULL;
                        ir_node    *b        = NULL;
@@ -354,10 +343,8 @@ synth_zero_one:
                        set_irn_mode(node, mode);
                        res = node;
                        goto own_replacement;
-               } else {
-                       panic("unexpected projb: %+F (pred: %+F)", node, pred);
                }
-               break;
+               panic("unexpected projb: %+F (pred: %+F)", node, pred);
        }
 
        case iro_Const: {
@@ -470,6 +457,9 @@ void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig)
        ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 
        if (changed) {
-               set_irg_outs_inconsistent(irg);
+               /* lowering might create new blocks, so be sure to handle this */
+               set_irg_extblk_inconsistent(irg);
+               set_irg_doms_inconsistent(irg);
+               edges_deactivate(irg);
        }
 }