s/get_irn_op(x) {==,!=} op_FOO/{,!}is_FOO(x)/.

[libfirm] / ir / opt / opt_osr.c

diff --git a/ir/opt/opt_osr.c b/ir/opt/opt_osr.c
index 7144e18..4bf9050 100644 (file)
--- a/ir/opt/opt_osr.c
+++ b/ir/opt/opt_osr.c
@@ -997,7 +997,7 @@ static void do_dfs(ir_graph *irg, iv_env *env) {
        ir_node *end = get_irg_end(irg);
        int i, n;
 
-       set_using_irn_visited(irg);
+       ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
 
        current_ir_graph = irg;
        inc_irg_visited(irg);
@@ -1014,7 +1014,7 @@ static void do_dfs(ir_graph *irg, iv_env *env) {
                        dfs(ka, env);
        }
 
-       clear_using_irn_visited(irg);
+       ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 
        current_ir_graph = rem;
 }
@@ -1112,8 +1112,8 @@ static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env
                        DB((dbg, LEVEL_4, " + %+F", tv_r));
                        break;
                case iro_Sub:
-                       tv      = tarval_sub(tv_l, tv_r);
-                       tv_init = tarval_sub(tv_init, tv_r);
+                       tv      = tarval_sub(tv_l, tv_r, NULL);
+                       tv_init = tarval_sub(tv_init, tv_r, NULL);
                        DB((dbg, LEVEL_4, " - %+F", tv_r));
                        break;
                default:
@@ -1125,7 +1125,7 @@ static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env
                        tv = tarval_add(tv, tv_incr);
                } else {
                        assert(pscc->code == iro_Sub);
-                       tv = tarval_sub(tv, tv_incr);
+                       tv = tarval_sub(tv, tv_incr, NULL);
                }
 
                tarval_set_integer_overflow_mode(ovmode);
@@ -1189,7 +1189,7 @@ static void do_lftr(ir_node *cmp, void *ctx) {
        ir_node *iv, *rc;
        ir_node *nleft = NULL, *nright = NULL;
 
-       if (get_irn_op(cmp) != op_Cmp)
+       if (!is_Cmp(cmp))
                return;
 
        left  = get_Cmp_left(cmp);