Replaced set_irn_n(*, -1, *) and get_irn_n(*, -1) by new get_nodes_block()/set_nodes_...

[libfirm] / ir / opt / ldst2.c

diff --git a/ir/opt/ldst2.c b/ir/opt/ldst2.c
index f5ae3a2..20b8109 100644 (file)
--- a/ir/opt/ldst2.c
+++ b/ir/opt/ldst2.c
@@ -27,6 +27,8 @@
 #include "config.h"
 #endif
 
+#include "iroptimize.h"
+
 #include "array.h"
 #include "debug.h"
 #include "ircons.h"
@@ -37,9 +39,7 @@
 #include "irmemory.h"
 #include "irnode.h"
 #include "irnodeset.h"
-#include "ldst2.h"
 #include "obst.h"
-#include "return.h"
 #include "irdump.h"
 #include "irflag_t.h"
 
@@ -104,6 +104,7 @@ static void AliasSetAdder(ir_node* block, void* env)
 {
        ir_nodeset_t* alias_set;
        size_t i;
+       (void) env;
 
        alias_set = NEW_ARR_D(ir_nodeset_t, &obst, count_addrs);
        for (i = 0; i < count_addrs; i++) {
@@ -134,6 +135,7 @@ static void AliasSetDestroyer(ir_node* block, void* env)
 {
        ir_nodeset_t* alias_set = get_irn_link(block);
        size_t i;
+       (void) env;
 
        for (i = 0; i < count_addrs; i++) {
                ir_nodeset_destroy(&alias_set[i]);
@@ -552,6 +554,7 @@ static void NormaliseSync(ir_node* node, void* env)
        ir_node** in;
        size_t count_preds;
        size_t i;
+       (void) env;
 
        if (!is_Sync(node)) return;
 
@@ -559,7 +562,7 @@ static void NormaliseSync(ir_node* node, void* env)
        AddSyncPreds(&preds, node);
 
        count_preds = ir_nodeset_size(&preds);
-       if (count_preds != get_Sync_n_preds(node)) {
+       if (count_preds != (unsigned)get_Sync_n_preds(node)) {
                NEW_ARR_A(ir_node*, in, count_preds);
                ir_nodeset_iterator_init(&iter, &preds);
                for (i = 0; i < count_preds; i++) {
@@ -602,9 +605,8 @@ void opt_ldst2(ir_graph* irg)
        irg_block_walk_graph(irg, AliasSetDestroyer, NULL, NULL);
        obstack_free(&obst, NULL);
 
-       normalize_proj_nodes(irg);
        irg_walk_graph(irg, NormaliseSync, NULL, NULL);
-  optimize_graph_df(irg);
+       optimize_graph_df(irg);
        irg_walk_graph(irg, NormaliseSync, NULL, NULL);
        dump_ir_block_graph(irg, "-postfluffig");
 }