bepbqpcoloring: Remove duplicate macros.

[libfirm] / ir / opt / proc_cloning.c

diff --git a/ir/opt/proc_cloning.c b/ir/opt/proc_cloning.c
index 8424a99..2d35920 100644 (file)
--- a/ir/opt/proc_cloning.c
+++ b/ir/opt/proc_cloning.c
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -267,10 +253,11 @@ static void set_preds(ir_node *irn, void *env)
        irn_copy = (ir_node*)get_irn_link(irn);
 
        if (is_Block(irn)) {
+               ir_graph *const irg = get_Block_irg(irn);
                for (i = get_Block_n_cfgpreds(irn) - 1; i >= 0; --i) {
                        pred = get_Block_cfgpred(irn, i);
                        /* "End" block must be handled extra, because it is not matured.*/
-                       if (get_irg_end_block(current_ir_graph) == irn)
+                       if (get_irg_end_block(irg) == irn)
                                add_immBlock_pred(get_irg_end_block(clone_irg), (ir_node*)get_irn_link(pred));
                        else
                                set_Block_cfgpred(irn_copy, i, (ir_node*)get_irn_link(pred));
@@ -301,13 +288,12 @@ static void set_preds(ir_node *irn, void *env)
 static ir_node *get_irg_arg(ir_graph *irg, size_t pos)
 {
        ir_node *irg_args = get_irg_args(irg), *arg = NULL;
-       int i;
 
        /* Call algorithm that computes the out edges */
        assure_irg_outs(irg);
 
        /* Search the argument with the number pos.*/
-       for (i = get_irn_n_outs(irg_args) - 1; i >= 0; --i) {
+       for (unsigned i = get_irn_n_outs(irg_args); i-- > 0; ) {
                ir_node *proj = get_irn_out(irg_args, i);
                if ((int)pos == get_Proj_proj(proj)) {
                        if (arg) {
@@ -514,7 +500,6 @@ static void reorder_weights(q_set *hmap, float threshold)
 {
        entry_t **adr, *p, *entry;
        size_t i, len;
-       ir_entity *callee;
 
 restart:
        entry = hmap->heavy_uses;
@@ -530,9 +515,8 @@ restart:
 
                /* we know, that a SymConst is here */
                ptr = get_Call_ptr(call);
-               assert(is_SymConst(ptr));
 
-               callee = get_SymConst_entity(ptr);
+               ir_entity *const callee = get_SymConst_entity(ptr);
                if (callee != entry->q.ent) {
                        /*
                         * This call is already changed because of a previous
@@ -571,7 +555,6 @@ restart:
                hmap->heavy_uses = entry->next;
                entry->next      = *adr;
                *adr             = entry;
-               entry            = hmap->heavy_uses;
 
                /* we have changed the list, check the next one */
                goto restart;
@@ -612,7 +595,7 @@ void proc_cloning(float threshold)
                /* We iterate the set and arrange the element of the set in a list.
                   The elements are arranged dependent of their value descending.*/
                if (hmap.map) {
-                       foreach_pset(hmap.map, entry_t*, entry) {
+                       foreach_pset(hmap.map, entry_t, entry) {
                                entry->weight = calculate_weight(entry);
 
                                /*