- fixed r22803

[libfirm] / ir / be / besched_t.h

diff --git a/ir/be/besched_t.h b/ir/be/besched_t.h
index 144e926..abb65ac 100644 (file)
--- a/ir/be/besched_t.h
+++ b/ir/be/besched_t.h
@@ -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.
  *
@@ -269,11 +269,7 @@ static INLINE void _sched_reset(const ir_node *node)
  */
 static INLINE void _sched_remove(const ir_node *irn)
 {
-       sched_info_t *info;
-#ifndef SCHEDULE_PROJ
-       assert(!is_Proj(irn));
-#endif
-       info = get_irn_sched_info(irn);
+       sched_info_t *info = get_irn_sched_info(irn);
        list_del(&info->list);
        INIT_LIST_HEAD(&info->list);
        info->scheduled = 0;
@@ -305,7 +301,7 @@ static INLINE int _sched_comes_after(const ir_node *n1, const ir_node *n2)
 {
        assert(_sched_is_scheduled(n1));
        assert(_sched_is_scheduled(n2));
-       assert(get_nodes_block(n1) == get_nodes_block(n2));
+       assert((is_Block(n1) ? n1 : get_nodes_block(n1)) == (is_Block(n2) ? n2 : get_nodes_block(n2)));
        return _sched_get_time_step(n1) < _sched_get_time_step(n2);
 }
 
@@ -321,8 +317,7 @@ typedef int (sched_predicator_t)(const ir_node *irn, void *data);
  * Predicate for sched_skip(), returns non-zero if irn is a control flow changing node.
  *
  * @param irn   the node to evaluate
- * @param data  an arch_env_t * used to determine if irn is a cf
- *              node for the given architecture
+ * @param data  unused
  */
 int sched_skip_cf_predicator(const ir_node *irn, void *data);