* @date 2.2002
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
-#ifdef HAVE_STRING_H
#include <string.h>
-#endif
#include "irouts.h"
#include "xmalloc.h"
#include "irgwalk.h"
#include "irdom_t.h"
-#include "irgraph_t.h" /* To access state field. */
+#include "irgraph_t.h"
#include "irnode_t.h"
#include "ircons_t.h"
#include "array_t.h"
/* The root of the dominator tree should be the Start block. */
ir_node *root = get_irg_start_block(irg);
- assert(irg->dom_state == dom_consistent
+ assert(irg->dom_state == dom_consistent
&& "The dominators of the irg must be consistent");
assert(root && "The start block of the graph is NULL?");
assert(get_dom_info(root)->idom == NULL
/* Iterate */
for (i = get_Block_n_cfg_outs_ka(bl) - 1; i >= 0; --i) {
ir_node *pred = get_Block_cfg_out_ka(bl, i);
- assert(is_Block(pred));
+ /* can happen for half-optimized dead code (I've seen this in student
+ projects */
+ if (!is_Block(pred))
+ continue;
+
init_tmp_dom_info(pred, tdi, tdi_list, used, n_blocks);
}
}
* if V is a root, return v, else return the vertex u, not being the
* root, with minimum u->semi on the path from v to its root.
*/
-INLINE static tmp_dom_info *dom_eval(tmp_dom_info *v) {
+inline static tmp_dom_info *dom_eval(tmp_dom_info *v) {
if (!v->ancestor) return v;
dom_compress (v);
return v->label;
}
/** make V W's ancestor */
-INLINE static void dom_link(tmp_dom_info *v, tmp_dom_info *w) {
+inline static void dom_link(tmp_dom_info *v, tmp_dom_info *w) {
w->ancestor = v;
}
for (i = j = 0; i < arity; i++) {
ir_node *pred = get_End_keepalive(end, i);
- if (is_Block(pred)) {
- if (Block_block_visited(pred))
+ if (!is_Block(pred)) {
+ pred = get_nodes_block(pred);
+ if (!is_Block(pred)) {
+ /* a node which has a bad block input: kill it */
continue;
-
- /* we found an endless loop */
- dec_irg_block_visited(irg);
- irg_block_walk(pred, pre, NULL, &n_blocks);
+ }
}
+ dec_irg_block_visited(irg);
+ irg_block_walk(pred, pre, NULL, &n_blocks);
in[j++] = pred;
}
if (j != arity) {
- /* we kill some Block keep-alives */
+ /* we kill some keep-alives */
set_End_keepalives(end, j, in);
set_irg_outs_inconsistent(irg);
}