fixed typo in Phi optimization

[libfirm] / ir / ir / iropt.c

diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c
index d12ed01..6310159 100644 (file)
--- a/ir/ir/iropt.c
+++ b/ir/ir/iropt.c
@@ -1771,8 +1771,12 @@ static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, tarval *(*eval)(ta
        void     **res;
        ir_node  *pred;
        ir_graph *irg;
-       int      i, n = get_irn_arity(a);
+       int      i, n;
 
+       if (get_nodes_block(a) != get_nodes_block(b))
+      return NULL;
+
+       n = get_irn_arity(a);
        NEW_ARR_A(void *, res, n);
 
        for (i = 0; i < n; ++i) {
@@ -2307,16 +2311,16 @@ restart:
 
                if (mode == get_irn_mode(b)) {
                        ir_mode *ma, *mb;
-
-                       a = get_Conv_op(a);
-                       b = get_Conv_op(b);
+                       ir_node *op_a = get_Conv_op(a);
+                       ir_node *op_b = get_Conv_op(b);
 
                        /* check if it's allowed to skip the conv */
-                       ma = get_irn_mode(a);
-                       mb = get_irn_mode(b);
+                       ma = get_irn_mode(op_a);
+                       mb = get_irn_mode(op_b);
 
                        if (mode_is_reference(ma) && mode_is_reference(mb)) {
                                /* SubInt(ConvInt(aP), ConvInt(bP)) -> SubInt(aP,bP) */
+                               a = op_a; b = op_b;
                                set_Sub_left(n, a);
                                set_Sub_right(n, b);
 
@@ -2747,7 +2751,7 @@ static ir_node *transform_node_DivMod(ir_node *n) {
        else if (is_Const(a) && is_const_Phi(b)) {
                /* check for Div(Const, Phi) */
                va = apply_binop_on_phi(b, get_Const_tarval(a), tarval_div, mode, 1);
-               va = apply_binop_on_phi(b, get_Const_tarval(a), tarval_mod, mode, 1);
+               vb = apply_binop_on_phi(b, get_Const_tarval(a), tarval_mod, mode, 1);
                if (va && vb) {
                        DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI);
                        DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI);