Fixed combo by fixing an old artefact from the older libFirm Cmp nodes.

[libfirm] / ir / lower / lower_mode_b.c

diff --git a/ir/lower/lower_mode_b.c b/ir/lower/lower_mode_b.c
index ea50c29..2821a67 100644 (file)
--- a/ir/lower/lower_mode_b.c
+++ b/ir/lower/lower_mode_b.c
@@ -85,7 +85,7 @@ static void maybe_kill_node(ir_node *node)
        }
        set_nodes_block(node, new_r_Bad(irg));
 
-       edges_node_deleted(node, irg);
+       edges_node_deleted(node);
 }
 
 static ir_node *create_not(dbg_info *dbgi, ir_node *node)
@@ -215,10 +215,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 +278,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;
@@ -471,5 +471,9 @@ void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig)
 
        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);
+               set_irg_loopinfo_inconsistent(irg);
        }
 }