Fixed some obviously wrong conditions.

[libfirm] / ir / ir / irnode_t.h

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index 2f4e782..58e5ec5 100644 (file)
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -31,7 +31,6 @@
 #include "irop_t.h"
 #include "irgraph_t.h"
 #include "irflag_t.h"
-#include "firm_common_t.h"
 #include "array.h"
 
 /**
@@ -49,8 +48,7 @@ long          get_irn_proj_attr      (ir_node *node);
 alloc_attr    *get_irn_alloc_attr    (ir_node *node);
 free_attr     *get_irn_free_attr     (ir_node *node);
 symconst_attr *get_irn_symconst_attr (ir_node *node);
-ir_type       *get_irn_call_attr     (ir_node *node);
-ir_type       *get_irn_funccall_attr (ir_node *node);
+call_attr     *get_irn_call_attr     (ir_node *node);
 sel_attr      *get_irn_sel_attr      (ir_node *node);
 phi_attr      *get_irn_phi_attr      (ir_node *node);
 block_attr    *get_irn_block_attr    (ir_node *node);
@@ -535,6 +533,12 @@ _is_Block_dead(const ir_node *block) {
        }
 }
 
+static inline ir_graph *
+_get_Block_irg(const ir_node *block) {
+       assert(is_Block(block) || is_Bad(block));
+       return block->attr.irg.irg;
+}
+
 static inline tarval *_get_Const_tarval(const ir_node *node) {
        assert(_get_irn_op(node) == op_Const);
        return node->attr.con.tv;
@@ -736,6 +740,7 @@ _is_arg_Proj(const ir_node *node) {
 #define Block_block_visited(node)             _Block_block_visited(node)
 #define set_Block_dead(block)                 _set_Block_dead(block)
 #define is_Block_dead(block)                  _is_Block_dead(block)
+#define get_Block_irg(block)                  _get_Block_irg(block)
 #define get_Const_tarval(node)                _get_Const_tarval(node)
 #define is_Const_null(node)                   _is_Const_null(node)
 #define is_Const_one(node)                    _is_Const_one(node)