used new is_Return()

[r7396]

diff --git a/ir/ir/ircgcons.c b/ir/ir/ircgcons.c
index bae128c..2346b05 100644 (file)
--- a/ir/ir/ircgcons.c
+++ b/ir/ir/ircgcons.c
@@ -284,12 +284,12 @@ static void prepare_irg_end(ir_graph * irg, irg_data_t * data) {
   int n_ret = 0;
 
   for (i = get_Block_n_cfgpreds(end_block) - 1; i >= 0; --i) {
-    if (get_irn_op(cfgpred_arr[i]) == op_Return) {
+    if (is_Return(cfgpred_arr[i])) {
       if (ret_arr) {
-       ARR_APP1(ir_node *, ret_arr, cfgpred_arr[i]);
+        ARR_APP1(ir_node *, ret_arr, cfgpred_arr[i]);
       } else {
-       ret_arr = NEW_ARR_F(ir_node *, 1);
-       ret_arr[0] = cfgpred_arr[i];
+        ret_arr = NEW_ARR_F(ir_node *, 1);
+        ret_arr[0] = cfgpred_arr[i];
       }
       ++n_ret;
     }
@@ -351,12 +351,12 @@ static void prepare_irg_end_except(ir_graph * irg, irg_data_t * data) {
   int n_except = 0;
   ir_node ** cfgpred_arr = get_Block_cfgpred_arr(end_block);
   for (i = get_Block_n_cfgpreds(end_block) - 1; i >= 0; --i) {
-    if (get_irn_op(cfgpred_arr[i]) != op_Return) {
+    if (! is_Return(cfgpred_arr[i])) {
       if (except_arr) {
-    ARR_APP1(ir_node *, except_arr, cfgpred_arr[i]);
+        ARR_APP1(ir_node *, except_arr, cfgpred_arr[i]);
       } else {
-    except_arr = NEW_ARR_F(ir_node *, 1);
-    except_arr[0] = cfgpred_arr[i];
+        except_arr = NEW_ARR_F(ir_node *, 1);
+        except_arr[0] = cfgpred_arr[i];
       }
       ++n_except;
     }

diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c
index ab87208..90a8eec 100644 (file)
--- a/ir/ir/irvrfy.c
+++ b/ir/ir/irvrfy.c
@@ -776,7 +776,7 @@ static int verify_node_Block(ir_node *n, ir_graph *irg) {
       ir_node *pred =  skip_Proj(get_Block_cfgpred(n, i));
       if (is_Proj(pred) || get_irn_op(pred) == op_Tuple)
         break;   /*  We can not test properly.  How many tuples are there? */
-      ASSERT_AND_RET(((get_irn_op(pred) == op_Return) ||
+      ASSERT_AND_RET((is_Return(pred)                 ||
                       is_Bad(pred)                    ||
                       (get_irn_op(pred) == op_Raise)  ||
                       is_fragile_op(pred)               ),