fixed const mismatch

[libfirm] / ir / opt / return.c

diff --git a/ir/opt/return.c b/ir/opt/return.c
index 49d3981..2082d55 100644 (file)
--- a/ir/opt/return.c
+++ b/ir/opt/return.c
@@ -33,7 +33,7 @@
 /*
  * Normalize the Returns of a graph by creating a new End block
  * with One Return(Phi).
- * This is the prefered input for the if-conversion.
+ * This is the preferred input for the if-conversion.
  *
  * In pseudocode, it means:
  *
@@ -68,7 +68,7 @@ void normalize_one_return(ir_graph *irg)
   for (n_rets = i = 0; i < n; ++i) {
     ir_node *node = get_Block_cfgpred(endbl, i);
 
-    if (get_irn_op(node) == op_Return) {
+    if (is_Return(node)) {
       ++n_rets;
 
       set_bit(i);
@@ -121,7 +121,7 @@ void normalize_one_return(ir_graph *irg)
    * a new Block was added, so dominator, outs and loop are inconsistent,
    * trouts and callee-state should be still valid
    */
-  set_irg_dom_inconsistent(irg);
+  set_irg_doms_inconsistent(irg);
   set_irg_outs_inconsistent(irg);
   set_irg_loopinfo_state(current_ir_graph, loopinfo_cf_inconsistent);
 }
@@ -170,7 +170,7 @@ static int can_move_ret(ir_node *ret)
 /*
  * Normalize the Returns of a graph by moving
  * the Returns upwards as much as possible.
- * This might be prefered for code generation.
+ * This might be preferred for code generation.
  *
  * In pseudocode, it means:
  *
@@ -206,7 +206,7 @@ void normalize_n_returns(ir_graph *irg)
   for (n_finals = n_rets = i = 0; i < n; ++i) {
     ir_node *ret = get_Block_cfgpred(endbl, i);
 
-    if (get_irn_op(ret) == op_Return && can_move_ret(ret)) {
+    if (is_Return(ret) && can_move_ret(ret)) {
       /*
        * Ok, all conditions met, we can move this Return, put it
        * on our work list.
@@ -313,14 +313,14 @@ void normalize_n_returns(ir_graph *irg)
 
   exchange(endbl, new_r_Block(irg, n_finals, in));
 
-  /* the end block is not automatically skiped, so do it here */
+  /* the end block is not automatically skipped, so do it here */
   set_irg_end_block(irg, skip_Id(get_irg_end_block(irg)));
 
   /* Invalidate analysis information:
-   * Blocks become dead and new Eeturns were deleted, so dominator, outs and loop are inconsistent,
+   * Blocks become dead and new Returns were deleted, so dominator, outs and loop are inconsistent,
    * trouts and callee-state should be still valid
    */
-  set_irg_dom_inconsistent(irg);
+  set_irg_doms_inconsistent(irg);
   set_irg_outs_inconsistent(irg);
   set_irg_loopinfo_state(current_ir_graph, loopinfo_cf_inconsistent);
 }