fix abs creation after recent reassoc changes

[libfirm] / ir / lower / lower_mode_b.c

diff --git a/ir/lower/lower_mode_b.c b/ir/lower/lower_mode_b.c
index 13aa55e..078fa89 100644 (file)
--- a/ir/lower/lower_mode_b.c
+++ b/ir/lower/lower_mode_b.c
@@ -35,6 +35,7 @@
 #include "tv.h"
 #include "error.h"
 #include "lowering.h"
+#include "benode_t.h"
 
 static ir_mode *lowered_mode     = NULL;
 static int      lower_direct_cmp = 0;
@@ -67,7 +68,7 @@ static ir_node *lower_node(ir_node *node)
        if(op == op_Phi) {
                int       i, arity;
                ir_node **in;
-               ir_node  *unknown;
+               ir_node  *unknown, *new_phi;
 
                arity = get_irn_arity(node);
                in    = alloca(arity * sizeof(in[0]));
@@ -75,7 +76,7 @@ static ir_node *lower_node(ir_node *node)
                for(i = 0; i < arity; ++i) {
                        in[i] = unknown;
                }
-               ir_node *new_phi = new_rd_Phi(dbgi, irg, block, arity, in,
+               new_phi = new_rd_Phi(dbgi, irg, block, arity, in,
                                              lowered_mode);
                set_irn_link(node, new_phi);
 
@@ -101,6 +102,7 @@ static ir_node *lower_node(ir_node *node)
                        set_irn_n(copy, i, low_in);
                }
                set_irn_mode(copy, lowered_mode);
+
                set_irn_link(node, copy);
                return copy;
        }
@@ -120,7 +122,7 @@ static ir_node *lower_node(ir_node *node)
                ir_node *v_false     = get_Psi_default(node);
                ir_node *low_v_false = lower_node(v_false);
 
-               ir_node *and0     = new_rd_And(dbgi, irg, block, cond, low_v_true,
+               ir_node *and0     = new_rd_And(dbgi, irg, block, low_cond, low_v_true,
                                               lowered_mode);
 
                ir_node *not_cond = create_not(dbgi, low_cond);
@@ -162,10 +164,10 @@ static ir_node *lower_node(ir_node *node)
                        ir_node *left  = get_Cmp_left(pred);
                        ir_node *right = get_Cmp_right(pred);
 
-                       if(get_mode_size_bits(mode) < get_mode_size_bits(lowered_mode)
-                                || classify_Const(right) == CNST_NULL) {
+                       if( (mode_is_int(mode) || mode_is_reference(mode)) &&
+                               (get_mode_size_bits(mode) < get_mode_size_bits(lowered_mode)
+                                || classify_Const(right) == CNST_NULL)) {
                                int      pnc      = get_Proj_proj(node);
-                               ir_node *res      = NULL;
                                int      need_not = 0;
                                ir_node *a        = NULL;
                                ir_node *b        = NULL;
@@ -225,6 +227,9 @@ static ir_node *lower_node(ir_node *node)
                        set_irn_link(node, psi);
                        return psi;
                        }
+               } else if (be_is_Barrier(pred)) {
+                       /* nothing to do */
+                       return node;
                }
 
                panic("unexpected projb: %+F (pred: %+F)", node, pred);
@@ -296,6 +301,7 @@ void ir_lower_mode_b(ir_graph *irg, ir_mode *mode, int do_lower_direct_cmp)
        lowered_mode     = mode;
        lower_direct_cmp = do_lower_direct_cmp;
        set_using_irn_link(irg);
-       irg_walk_graph(irg, clear_links, lower_mode_b_walker, NULL);
+       irg_walk_graph(irg, clear_links, NULL, NULL);
+       irg_walk_graph(irg, lower_mode_b_walker, NULL, NULL);
        clear_using_irn_link(irg);
 }