Improve the AM folding heuristics: Do not fold AM if at least one of the AM operands...

[libfirm] / ir / be / belive_t.h

diff --git a/ir/be/belive_t.h b/ir/be/belive_t.h
index 1b7041e..c5379fe 100644 (file)
--- a/ir/be/belive_t.h
+++ b/ir/be/belive_t.h
@@ -30,6 +30,8 @@
 #include "irgraph_t.h"
 #include "irphase_t.h"
 #include "irhooks.h"
+#include "dfs.h"
+#include "statev.h"
 
 #include "pset.h"
 #include "bitset.h"
@@ -42,9 +44,13 @@
 #include "irlivechk.h"
 #endif
 
+struct be_irg_t;
+
 struct _be_lv_t {
        ir_phase ph;
        ir_graph *irg;
+       dfs_t *dfs;
+       const struct be_irg_t *birg;
        bitset_t *nodes;
        hook_entry_t hook_info;
 #ifdef USE_LIVE_CHK
@@ -97,18 +103,19 @@ struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *b
 
 static INLINE int _be_is_live_xxx(const struct _be_lv_t *li, const ir_node *block, const ir_node *irn, unsigned flags)
 {
+       int res;
+
        if (li->nodes) {
                struct _be_lv_info_node_t *info = be_lv_get(li, block, irn);
-               return info ? (info->flags & flags) != 0 : 0;
+               res = info ? (info->flags & flags) != 0 : 0;
        }
 
 #ifdef USE_LIVE_CHK
        else
-               return (lv_chk_bl_xxx(li->lvc, block, irn) & flags) != 0;
-#else
-       assert(li->nodes && "node sets must be computed");
-       return 0;
+               res = (lv_chk_bl_xxx(li->lvc, block, irn) & flags) != 0;
 #endif /* USE_LIVE_CHK */
+
+       return res;
 }
 
 #define be_lv_foreach(lv, bl, flags, i) \