rename tarval to ir_tarval

[libfirm] / ir / opt / cfopt.c

diff --git a/ir/opt/cfopt.c b/ir/opt/cfopt.c
index 90780f4..68b1221 100644 (file)
--- a/ir/opt/cfopt.c
+++ b/ir/opt/cfopt.c
@@ -638,7 +638,7 @@ static int handle_switch_cond(ir_node *cond)
        } else if (get_irn_link(proj2) == NULL) {
                /* We have two Proj's here. Check if the Cond has
                   a constant argument */
-               tarval *tv = value_of(sel);
+               ir_tarval *tv = value_of(sel);
 
                if (tv != tarval_bad) {
                        /* we have a constant switch */
@@ -702,7 +702,6 @@ void optimize_cf(ir_graph *irg)
        int i, j, n, changed;
        ir_node **in = NULL;
        ir_node *cond, *end = get_irg_end(irg);
-       ir_graph *rem = current_ir_graph;
        plist_element_t *el;
        merge_env env;
 
@@ -712,8 +711,6 @@ void optimize_cf(ir_graph *irg)
        assert(get_irg_pinned(irg) != op_pin_state_floats &&
               "Control flow optimization need a pinned graph");
 
-       current_ir_graph = irg;
-
        /* FIXME: control flow opt destroys block edges. So edges are deactivated here. Fix the edges! */
        edges_deactivate(irg);
 
@@ -876,8 +873,6 @@ restart:
                        fprintf(stderr, "VERIFY_BAD in optimize_cf()\n");
                }
        }
-
-       current_ir_graph = rem;
 }
 
 /* Creates an ir_graph pass for optimize_cf. */