X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircgcons.c;h=fdd4ba0b6b9bf50eedc1870f1a5cfb9ffb719cb0;hb=e1c33a238578342a072e1c95ff12eefe6d0acd37;hp=bae128c9a14d2bb7f4a0a649adb3a2036cb27d7b;hpb=ae0ec1b52600b7eec84770c373275b23c0e899b8;p=libfirm

diff --git a/ir/ir/ircgcons.c b/ir/ir/ircgcons.c
index bae128c9a..fdd4ba0b6 100644
--- 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;
     }
@@ -377,8 +377,6 @@ static void prepare_irg_end_except(ir_graph * irg, irg_data_t * data) {
         in[i] = new_r_Proj(irg, get_nodes_block(node), node, mode_M, pn_Raise_M);
       } else if (op == op_CopyB) {
         in[i] = new_r_Proj(irg, get_nodes_block(node), node, mode_M, pn_CopyB_M_except);
-      } else if (op == op_Bound) {
-        in[i] = new_r_Proj(irg, get_nodes_block(node), node, mode_M, pn_Bound_M_except);
       } else {
         assert(is_fragile_op(node));
         /* We rely that all cfops have the memory output at the same position. */