- skip Confirm and Cast for address calculation

[libfirm] / ir / opt / opt_confirms.c

diff --git a/ir/opt/opt_confirms.c b/ir/opt/opt_confirms.c
index 350fa57..3fd45f7 100644 (file)
--- a/ir/opt/opt_confirms.c
+++ b/ir/opt/opt_confirms.c
@@ -23,9 +23,7 @@
  * @author  Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #undef DEBUG_CONFIRM
 
@@ -241,7 +239,7 @@ value_classify_sign classify_value_sign(ir_node *n) {
                }
                break;
        }
-       if (get_irn_op(n) != op_Confirm)
+       if (!is_Confirm(n))
                return value_classified_unknown;
 
        tv  = value_of(get_Confirm_bound(n));
@@ -769,8 +767,8 @@ check_null_case:
                if ((pnc == pn_Cmp_Eq || pnc == pn_Cmp_Lg) &&
                        is_Const(right) && is_Const_null(right)) {
                        /* for == 0 or != 0 we have some special tools */
-                       ir_mode *mode = get_irn_mode(left);
-                       ir_node *dummy;
+                       ir_mode       *mode = get_irn_mode(left);
+                       const ir_node *dummy;
                        if (mode_is_reference(mode)) {
                                if (value_not_null(left, &dummy)) {
                                        tv = pnc == pn_Cmp_Eq ? tarval_b_false : tarval_b_true;