replace is_no_Block() with !is_Block()

[libfirm] / ir / opt / jumpthreading.c

diff --git a/ir/opt/jumpthreading.c b/ir/opt/jumpthreading.c
index 3e53ddb..3f9e42e 100644 (file)
--- a/ir/opt/jumpthreading.c
+++ b/ir/opt/jumpthreading.c
@@ -117,7 +117,7 @@ static ir_node *search_def_and_create_phis(ir_node *block, ir_mode *mode,
 
        /* create a new Phi */
        NEW_ARR_A(ir_node*, in, n_cfgpreds);
-       for(i = 0; i < n_cfgpreds; ++i)
+       for (i = 0; i < n_cfgpreds; ++i)
                in[i] = new_Unknown(mode);
 
        phi = new_r_Phi(block, n_cfgpreds, in, mode);
@@ -125,7 +125,7 @@ static ir_node *search_def_and_create_phis(ir_node *block, ir_mode *mode,
        mark_irn_visited(block);
 
        /* set Phi predecessors */
-       for(i = 0; i < n_cfgpreds; ++i) {
+       for (i = 0; i < n_cfgpreds; ++i) {
                ir_node *pred_block = get_Block_cfgpred_block(block, i);
                ir_node *pred_val   = search_def_and_create_phis(pred_block, mode, 0);
 
@@ -190,7 +190,8 @@ static void construct_ssa(ir_node *orig_block, ir_node *orig_val,
        }
 }
 
-static void split_critical_edge(ir_node *block, int pos) {
+static void split_critical_edge(ir_node *block, int pos)
+{
        ir_graph *irg = get_irn_irg(block);
        ir_node *in[1];
        ir_node *new_block;
@@ -236,7 +237,7 @@ static ir_node *copy_and_fix_node(const jumpthreading_env_t *env,
                assert(get_irn_mode(copy) != mode_X);
 
                arity = get_irn_arity(copy);
-               for(i = 0; i < arity; ++i) {
+               for (i = 0; i < arity; ++i) {
                        ir_node *pred     = get_irn_n(copy, i);
                        ir_node *new_pred;
 
@@ -384,13 +385,16 @@ static int eval_cmp_tv(pn_Cmp pnc, tarval *tv_left, tarval *tv_right)
 static int eval_cmp_vrp(pn_Cmp pnc, ir_node *left, ir_node *right)
 {
        pn_Cmp cmp_result = vrp_cmp(left, right);
-
        /* does the compare evaluate to true? */
-       if (cmp_result == pn_Cmp_False)
+       if (cmp_result == pn_Cmp_False) {
                return -1;
-       if ((cmp_result & pnc) != cmp_result)
+       }
+       if ((cmp_result & pnc) != cmp_result) {
+               if ((cmp_result & pnc) != 0) {
+                       return -1;
+               }
                return 0;
-
+       }
        return 1;
 }
 /**
@@ -477,7 +481,7 @@ static ir_node *find_const_or_confirm(jumpthreading_env_t *env, ir_node *jump,
                }
 
                arity = get_irn_arity(value);
-               for(i = 0; i < arity; ++i) {
+               for (i = 0; i < arity; ++i) {
                        ir_node *copy_block;
                        ir_node *phi_pred = get_Phi_pred(value, i);
                        ir_node *cfgpred  = get_Block_cfgpred(block, i);
@@ -541,7 +545,7 @@ static ir_node *find_candidate(jumpthreading_env_t *env, ir_node *jump,
                        return NULL;
 
                arity = get_irn_arity(value);
-               for(i = 0; i < arity; ++i) {
+               for (i = 0; i < arity; ++i) {
                        ir_node *copy_block;
                        ir_node *phi_pred = get_Phi_pred(value, i);
                        ir_node *cfgpred  = get_Block_cfgpred(block, i);