fix invalid double definition of irg_extblk_info_state

[r28060]

diff --git a/include/libfirm/irextbb.h b/include/libfirm/irextbb.h
index 7ce95cf..a4a2c85 100644 (file)
--- a/include/libfirm/irextbb.h
+++ b/include/libfirm/irextbb.h
@@ -31,13 +31,6 @@
 #include "execfreq.h"
 #include "begin.h"
 
-/** Flags for extended basic block state. */
-typedef enum {
-  ir_extblk_info_none    = 0,  /**< No extended basic block information is constructed. Default. */
-  ir_extblk_info_valid   = 1,  /**< Extended basic block information is valid. */
-  ir_extblk_info_invalid = 2   /**< Extended basic block information is constructed but invalid. */
-} irg_extblk_info_state;
-
 /* type of callback function for ir_graph walk */
 #ifndef _EXTBB_WALK_FUNC_TYPEDEF_
 #define _EXTBB_WALK_FUNC_TYPEDEF_

diff --git a/include/libfirm/irgraph.h b/include/libfirm/irgraph.h
index a9d2854..bccd0e0 100644 (file)
--- a/include/libfirm/irgraph.h
+++ b/include/libfirm/irgraph.h
@@ -336,11 +336,11 @@ FIRM_API void set_irg_outs_inconsistent(ir_graph *irg);
 
 /** state:  extended basic block state. */
 typedef enum {
-       extblk_none    = 0,  /**< No extended basic block information is constructed. Default. */
-       extblk_valid   = 1,  /**< Extended basic block information is valid. */
-       extblk_invalid = 2   /**< Extended basic block information is constructed but invalid. */
-} irg_extblk_state;
-FIRM_API irg_extblk_state get_irg_extblk_state(const ir_graph *irg);
+       ir_extblk_info_none    = 0,  /**< No extended basic block information is constructed. Default. */
+       ir_extblk_info_valid   = 1,  /**< Extended basic block information is valid. */
+       ir_extblk_info_invalid = 2   /**< Extended basic block information is constructed but invalid. */
+} irg_extblk_info_state;
+FIRM_API irg_extblk_info_state get_irg_extblk_state(const ir_graph *irg);
 FIRM_API void set_irg_extblk_inconsistent(ir_graph *irg);
 
 /** state: dom_state

diff --git a/ir/adt/raw_bitset.h b/ir/adt/raw_bitset.h
index 0dbf6b2..77630f0 100644 (file)
--- a/ir/adt/raw_bitset.h
+++ b/ir/adt/raw_bitset.h
@@ -233,7 +233,7 @@ static inline void rbitset_flip_all(unsigned *bitset, unsigned size)
  */
 static inline bool rbitset_is_set(const unsigned *bitset, unsigned pos)
 {
-       return BITSET_ELEM(bitset, pos) & (1 << (pos % BITS_PER_ELEM));
+       return (BITSET_ELEM(bitset, pos) & (1 << (pos % BITS_PER_ELEM))) != 0;
 }
 
 /**

diff --git a/ir/ana/irextbb.c b/ir/ana/irextbb.c
index 34fd81c..7b29c01 100644 (file)
--- a/ir/ana/irextbb.c
+++ b/ir/ana/irextbb.c
@@ -266,7 +266,7 @@ void compute_extbb(ir_graph *irg)
                extbb->visited = 0;
        }
 
-       irg->extblk_state = extblk_valid;
+       irg->extblk_state = ir_extblk_info_valid;
 }
 
 /* free all extended block info. */
@@ -277,7 +277,7 @@ void free_extbb(ir_graph *irg)
                xfree(irg->extbb_obst);
                irg->extbb_obst = NULL;
        }
-       irg->extblk_state = extblk_none;
+       irg->extblk_state = ir_extblk_info_none;
 }
 
 /* Return the extended block of a node. */

diff --git a/ir/ana/irextbb2.c b/ir/ana/irextbb2.c
index 2a596c5..ce16526 100644 (file)
--- a/ir/ana/irextbb2.c
+++ b/ir/ana/irextbb2.c
@@ -243,5 +243,5 @@ void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs)
                extbb->visited = 0;
        }
 
-       irg->extblk_state = extblk_valid;
+       irg->extblk_state = ir_extblk_info_valid;
 }

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 074c709..d97163f 100644 (file)
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -2252,7 +2252,7 @@ static void dump_blocks_extbb_grouped(FILE *F, ir_graph *irg)
        int        i;
        ir_entity *ent = get_irg_entity(irg);
 
-       if (get_irg_extblk_state(irg) != extblk_valid)
+       if (get_irg_extblk_state(irg) != ir_extblk_info_valid)
                compute_extbb(irg);
 
        construct_extblock_lists(irg);

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index 45db7de..ade886f 100644 (file)
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -702,7 +702,7 @@ void (set_irg_outs_inconsistent)(ir_graph *irg)
        _set_irg_outs_inconsistent(irg);
 }
 
-irg_extblk_state (get_irg_extblk_state)(const ir_graph *irg)
+irg_extblk_info_state (get_irg_extblk_state)(const ir_graph *irg)
 {
        return _get_irg_extblk_state(irg);
 }

diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h
index d67759f..9cc9fde 100644 (file)
--- a/ir/ir/irgraph_t.h
+++ b/ir/ir/irgraph_t.h
@@ -271,15 +271,15 @@ static inline void _set_irg_outs_inconsistent(ir_graph *irg)
                irg->outs_state = outs_inconsistent;
 }
 
-static inline irg_extblk_state _get_irg_extblk_state(const ir_graph *irg)
+static inline irg_extblk_info_state _get_irg_extblk_state(const ir_graph *irg)
 {
-  return irg->extblk_state;
+       return irg->extblk_state;
 }
 
 static inline void _set_irg_extblk_inconsistent(ir_graph *irg)
 {
-       if (irg->extblk_state == extblk_valid)
-               irg->extblk_state = extblk_invalid;
+       if (irg->extblk_state == ir_extblk_info_valid)
+               irg->extblk_state = ir_extblk_info_invalid;
 }
 
 static inline irg_dom_state _get_irg_dom_state(const ir_graph *irg)