Partially undo r20786: Emit ret $0 especially when its BB is only reached by a fallt...

[libfirm] / ir / be / beifg_clique.c

diff --git a/ir/be/beifg_clique.c b/ir/be/beifg_clique.c
index 5a3eaf7..1a82faf 100644 (file)
--- a/ir/be/beifg_clique.c
+++ b/ir/be/beifg_clique.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -43,7 +43,6 @@
 #include "beintlive_t.h"
 #include "beifg_t.h"
 #include "bechordal_t.h"
-#include "benodesets.h"
 
 typedef struct _cli_head_t {
        struct list_head   list;
@@ -116,7 +115,7 @@ static cli_element_t *get_new_cli_element(ifg_clique_t *ifg)
        return cli_element;
 }
 
-static void write_clique(nodeset *live_set, ifg_clique_t *ifg)
+static void write_clique(ir_nodeset_t *live_set, ifg_clique_t *ifg)
 {
        ir_node *live_irn;
        ir_node *test_node;
@@ -127,8 +126,9 @@ static void write_clique(nodeset *live_set, ifg_clique_t *ifg)
        cli_element_t *element = NULL;
        cli_head_t *cli_head = get_new_cli_head(ifg);
        int is_element = 0;
+       ir_nodeset_iterator_t iter;
 
-       foreach_nodeset(live_set, live_irn)
+       foreach_ir_nodeset(live_set, live_irn, iter)
        {
                /* test if node is max or min dominator*/
                test_node = live_irn;
@@ -270,8 +270,6 @@ static void find_nodes(const ifg_clique_t *ifg, cli_iter_t *it)
                element = list_entry(cli_head->list.next, cli_element_t, list);
                it->curr_cli_element = element;
        }
-
-       return;
 }
 
 static ir_node *get_next_node(cli_iter_t *it)
@@ -327,10 +325,12 @@ static void find_neighbour_walker(ir_node *bl, void *data)
 {
        ifg_clique_t     *ifg    = data;
        struct list_head *head   = get_block_border_head(ifg->env, bl);
-       int              was_def = 0;
-       nodeset          *live   = new_nodeset(ifg->env->cls->n_regs);
+       int               was_def = 0;
+       ir_nodeset_t      live;
        border_t         *b;
 
+       ir_nodeset_init(&live);
+
        assert(is_Block(bl) && "There is no block to work on.");
 
        foreach_border_head(head, b) /* follow the borders of the block */
@@ -339,7 +339,7 @@ static void find_neighbour_walker(ir_node *bl, void *data)
 
                if (b->is_def) /* b is a new node */
                {
-                       nodeset_insert(live, irn);
+                       ir_nodeset_insert(&live, irn);
                        if(b->is_real)
                        {
                                was_def = 1;
@@ -349,13 +349,13 @@ static void find_neighbour_walker(ir_node *bl, void *data)
                {
                        if (was_def == 1) /* if there is a USE after a DEF... */
                        {
-                               write_clique(live, ifg); /* ...add the clique. */
+                               write_clique(&live, ifg); /* ...add the clique. */
                                was_def = 0;
                        }
-                       nodeset_remove(live, irn);
+                       ir_nodeset_remove(&live, irn);
                }
        }
-       del_nodeset(live);
+       ir_nodeset_destroy(&live);
 }
 
 static void find_first_neighbour(const ifg_clique_t *ifg, cli_iter_t *it, const ir_node *irn)
@@ -399,8 +399,6 @@ static void find_first_neighbour(const ifg_clique_t *ifg, cli_iter_t *it, const
 
        it->curr_cli_element = element;
        it->curr_irn = irn;
-
-       return;
 }
 
 static ir_node *get_next_neighbour(cli_iter_t *it)
@@ -472,16 +470,16 @@ static ir_node *ifg_clique_neighbours_begin(const void *self, void *iter, const
 
 static ir_node *ifg_clique_neighbours_next(const void *self, void *iter)
 {
+       (void) self;
        return get_next_neighbour(iter);
 }
 
 static void ifg_clique_neighbours_break(const void *self, void *iter)
 {
        cli_iter_t *it = iter;
+       (void) self;
 
        bitset_free(it->visited_neighbours);
-
-       return;
 }
 
 static ir_node *ifg_clique_nodes_begin(const void *self, void *iter)
@@ -492,16 +490,16 @@ static ir_node *ifg_clique_nodes_begin(const void *self, void *iter)
 
 static ir_node *ifg_clique_nodes_next(const void *self, void *iter)
 {
+       (void) self;
        return get_next_node(iter);
 }
 
 static void ifg_clique_nodes_break(const void *self, void *iter)
 {
        cli_iter_t *it = iter;
+       (void) self;
 
        bitset_free(it->visited_nodes);
-
-       return;
 }
 
 static int ifg_clique_degree(const void *self, const ir_node *irn)