X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcfopt.c;h=a8c647cb5e0ba821b361cdba36ecb531e393b6f4;hb=edb11cbddcf9e4fef1bde33d576003af8a6a3323;hp=e3a14b48dcfda4af895d9c4e73faed5aeb5fd021;hpb=b597c7fd473086ca6374b2abbdf129f595c156d0;p=libfirm

diff --git a/ir/opt/cfopt.c b/ir/opt/cfopt.c
index e3a14b48d..a8c647cb5 100644
--- a/ir/opt/cfopt.c
+++ b/ir/opt/cfopt.c
@@ -45,7 +45,7 @@
 #include "irvrfy.h"
 #include "iredges.h"
 
-#include "array.h"
+#include "array_t.h"
 
 #include "irouts.h"
 #include "irbackedge_t.h"
@@ -434,8 +434,7 @@ static void optimize_blocks(ir_node *b, void *ctx) {
 
 			if (is_Block_dead(pred)) {
 				/* case Phi 1: Do nothing */
-			}
-			else if (is_Block_removable(pred) && Block_not_block_visited(pred)) {
+			} else if (is_Block_removable(pred) && !Block_block_visited(pred)) {
 				/* case Phi 2: It's an empty block and not yet visited. */
 				ir_node *phi_pred = get_Phi_pred(phi, i);
 
@@ -478,7 +477,7 @@ static void optimize_blocks(ir_node *b, void *ctx) {
 	for (k = 0, n = get_Block_n_cfgpreds(b); k < n; ++k) {
 		ir_node *predb = get_nodes_block(get_Block_cfgpred(b, k));
 
-		if (is_Block_removable(predb) && Block_not_block_visited(predb)) {
+		if (is_Block_removable(predb) && !Block_block_visited(predb)) {
 			ir_node *next_phi;
 
 			/* we found a predecessor block at position k that will be removed */
@@ -505,7 +504,7 @@ static void optimize_blocks(ir_node *b, void *ctx) {
 
 						if (is_Block_dead(pred)) {
 							/* Do nothing */
-						} else if (is_Block_removable(pred) && Block_not_block_visited(pred)) {
+						} else if (is_Block_removable(pred) && !Block_block_visited(pred)) {
 							/* It's an empty block and not yet visited. */
 							for (j = 0; j < get_Block_n_cfgpreds(pred); j++) {
 								if (! is_Bad(get_Block_cfgpred(pred, j)))
@@ -529,7 +528,7 @@ static void optimize_blocks(ir_node *b, void *ctx) {
 
 						if (is_Block_dead(pred)) {
 							/* Do nothing */
-						} else if (is_Block_removable(pred) && Block_not_block_visited(pred)) {
+						} else if (is_Block_removable(pred) && !Block_block_visited(pred)) {
 							/* It's an empty block and not yet visited. */
 							for (j = 0; j < get_Block_n_cfgpreds(pred); j++) {
 								if (! is_Bad(get_Block_cfgpred(pred, j)))
@@ -561,7 +560,7 @@ static void optimize_blocks(ir_node *b, void *ctx) {
 
 		if (is_Block_dead(pred)) {
 			/* case 1: Do nothing */
-		} else if (is_Block_removable(pred) && Block_not_block_visited(pred)) {
+		} else if (is_Block_removable(pred) && !Block_block_visited(pred)) {
 			/* case 2: It's an empty block and not yet visited. */
 			assert(get_Block_n_cfgpreds(b) > 1);
 			/* Else it should be optimized by equivalent_node. */
@@ -789,9 +788,7 @@ restart:
 		ir_node *ka = get_End_keepalive(end, i);
 
 		if (irn_not_visited(ka)) {
-			ir_op *op = get_irn_op(ka);
-
-			if ((op == op_Block) && Block_not_block_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);