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 73f9e24..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;
@@ -121,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);
@@ -163,8 +164,7 @@ static ir_node *lower_node(ir_node *node)
                        ir_node *left  = get_Cmp_left(pred);
                        ir_node *right = get_Cmp_right(pred);
 
-                       if( (mode_is_int(mode) || mode_is_character(mode)
-                                               || mode_is_reference(mode)) &&
+                       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);
@@ -227,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);