#include "irvrfy.h"
#include "iredges.h"
-#include "array.h"
+#include "array_t.h"
#include "irouts.h"
#include "irbackedge_t.h"
if (!is_Block_dead(b)) {
new_block = equivalent_node(b);
- while (irn_not_visited(b) && (!is_Block_dead(new_block)) && (new_block != b)) {
+ while (!irn_visited(b) && !is_Block_dead(new_block) && new_block != b) {
/* We would have to run gigo() if new is bad, so we
promote it directly below. Nevertheless, we sometimes reach a block
the first time through a dataflow node. In this case we optimized the
for (i = 0, k = get_Block_n_cfgpreds(b); i < k; ++i) {
max_preds += test_whether_dispensable(b, i);
}
- in = xmalloc(max_preds * sizeof(*in));
+ in = XMALLOCN(ir_node*, max_preds);
/*- Fix the Phi nodes of the current block -*/
for (phi = get_irn_link(b); phi; ) {
for (i = j = 0; i < n; i++) {
ir_node *ka = get_End_keepalive(end, i);
- if (irn_not_visited(ka)) {
- if (is_Block(ka) && !Block_block_visited(ka)) {
- /* irg_block_walk() will increase the block visited flag, but we must visit only
- these blocks that are not visited yet, so decrease it first. */
- set_irg_block_visited(irg, get_irg_block_visited(irg) - 1);
- irg_block_walk(ka, optimize_blocks, remove_simple_blocks, &env.changed);
- mark_irn_visited(ka);
- in[j++] = ka;
+ if (!irn_visited(ka)) {
+ if (is_Block(ka)) {
+ if (!Block_block_visited(ka)) {
+ /* irg_block_walk() will increase the block visited flag, but we must visit only
+ these blocks that are not visited yet, so decrease it first. */
+ set_irg_block_visited(irg, get_irg_block_visited(irg) - 1);
+ irg_block_walk(ka, optimize_blocks, remove_simple_blocks, &env.changed);
+ mark_irn_visited(ka);
+ in[j++] = ka;
+ }
} else {
mark_irn_visited(ka);
/* don't keep alive dead blocks */
- if (! is_Block_dead(get_nodes_block(ka)))
+ if (!is_Bad(ka) && !is_Block_dead(get_nodes_block(ka)))
in[j++] = ka;
}
}