make some more optimisations independent of current_ir_graph

[libfirm] / ir / opt / opt_confirms.c

diff --git a/ir/opt/opt_confirms.c b/ir/opt/opt_confirms.c
index dfae01a..d8c9464 100644 (file)
--- a/ir/opt/opt_confirms.c
+++ b/ir/opt/opt_confirms.c
@@ -58,7 +58,7 @@ typedef struct interval_t {
 
 #ifdef DEBUG_CONFIRM
 
-#define compare_iv(l_iv, r_iv, pnc)            compare_iv_dbg(l_iv, r_iv, pnc)
+#define compare_iv(l_iv, r_iv, pnc)    compare_iv_dbg(l_iv, r_iv, pnc)
 
 /* forward */
 static tarval *compare_iv_dbg(const interval_t *l_iv, const interval_t *r_iv, pn_Cmp pnc);
@@ -107,8 +107,8 @@ int value_not_zero(const ir_node *n, ir_node_cnst_ptr *confirm)
 
        /* there might be several Confirms one after other that form an interval */
        for (;;) {
-               if (is_Minus(n) || is_Abs(n)) {
-                       /* we can safely skip Minus and Abs when checking for != 0 */
+               if (is_Minus(n)) {
+                       /* we can safely skip Minus when checking for != 0 */
                        n = get_unop_op(n);
                        continue;
                }
@@ -201,7 +201,7 @@ int value_not_null(const ir_node *n, ir_node_cnst_ptr *confirm)
        if (is_Global(n)) {
                /* global references are never NULL */
                return 1;
-       } else if (n == get_irg_frame(current_ir_graph)) {
+       } else if (n == get_irg_frame(get_irn_irg(n))) {
                /* local references are never NULL */
                return 1;
        } else if (is_Alloc(n)) {