fix bug in switch_lowerer

[libfirm] / ir / ana / irlivechk.c

diff --git a/ir/ana/irlivechk.c b/ir/ana/irlivechk.c
index 38798ac..3ea67bd 100644 (file)
--- a/ir/ana/irlivechk.c
+++ b/ir/ana/irlivechk.c
@@ -58,7 +58,7 @@
 
 #include "statev.h"
 
-typedef struct _bl_info_t {
+typedef struct bl_info_t {
        const ir_node *block;      /**< The block. */
 
        int be_tgt_calc : 1;
@@ -75,7 +75,7 @@ typedef struct _bl_info_t {
 
 #define get_block_info(lv, bl) ((bl_info_t *) phase_get_irn_data(&(lv)->ph, bl))
 
-struct _lv_chk_t {
+struct lv_chk_t {
        ir_phase     ph;
        const dfs_t *dfs;
        int          n_blocks;
@@ -85,9 +85,9 @@ struct _lv_chk_t {
        DEBUG_ONLY(firm_dbg_module_t *dbg;)
 };
 
-static void *init_block_data(ir_phase *ph, const ir_node *irn, void *old)
+static void *init_block_data(ir_phase *ph, const ir_node *irn)
 {
-       lv_chk_t *lv      = container_of(ph, lv_chk_t, ph);
+       lv_chk_t *lv      = firm_container_of(ph, lv_chk_t, ph);
        bl_info_t *bi     = phase_alloc(ph, sizeof(bi[0]));
 
        bi->id            = get_Block_dom_tree_pre_num(irn);
@@ -95,7 +95,6 @@ static void *init_block_data(ir_phase *ph, const ir_node *irn, void *old)
        bi->red_reachable = bitset_obstack_alloc(phase_obst(ph), lv->n_blocks);
        bi->be_tgt_reach  = bitset_obstack_alloc(phase_obst(ph), lv->n_blocks);
        bi->be_tgt_calc   = 0;
-       (void) old;
        return bi;
 }
 
@@ -112,7 +111,8 @@ static inline int is_liveness_node(const ir_node *irn)
        case iro_End:
        case iro_Anchor:
                return 0;
-       default:;
+       default:
+               break;
        }
 
        return 1;