X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firdom.c;h=62c842f73686af5424d29db3a9cf947dea6e4fd2;hb=e753342df164efb60bea6460ea777fdfd80eb288;hp=af11ca9d1484811c64c056fbabc1e7420216ce0f;hpb=1b57293234c2f0c753f48c94e0ca0f127b15a27b;p=libfirm

diff --git a/ir/ana/irdom.c b/ir/ana/irdom.c
index af11ca9d1..62c842f73 100644
--- a/ir/ana/irdom.c
+++ b/ir/ana/irdom.c
@@ -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.
  *
@@ -63,7 +63,7 @@ ir_node *get_Block_idom(const ir_node *bl) {
 void set_Block_idom(ir_node *bl, ir_node *n) {
 	ir_dom_info *bli = get_dom_info(bl);
 
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 
 	/* Set the immediate dominator of bl to n */
 	bli->idom = n;
@@ -92,7 +92,7 @@ ir_node *get_Block_ipostdom(const ir_node *bl) {
 void set_Block_ipostdom(ir_node *bl, ir_node *n) {
 	ir_dom_info *bli = get_pdom_info(bl);
 
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 
 	/* Set the immediate post dominator of bl to n */
 	bli->idom = n;
@@ -110,43 +110,43 @@ void set_Block_ipostdom(ir_node *bl, ir_node *n) {
 }
 
 int get_Block_dom_pre_num(const ir_node *bl) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	return get_dom_info(bl)->pre_num;
 }
 
 void set_Block_dom_pre_num(ir_node *bl, int num) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	get_dom_info(bl)->pre_num = num;
 }
 
 int get_Block_dom_depth(const ir_node *bl) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	return get_dom_info(bl)->dom_depth;
 }
 
 void set_Block_dom_depth(ir_node *bl, int depth) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	get_dom_info(bl)->dom_depth = depth;
 }
 
 
 int get_Block_postdom_pre_num(const ir_node *bl) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	return get_pdom_info(bl)->pre_num;
 }
 
 void set_Block_postdom_pre_num(ir_node *bl, int num) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	get_pdom_info(bl)->pre_num = num;
 }
 
 int get_Block_postdom_depth(const ir_node *bl) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	return get_pdom_info(bl)->dom_depth;
 }
 
 void set_Block_postdom_depth(ir_node *bl, int depth) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	get_pdom_info(bl)->dom_depth = depth;
 }
 
@@ -636,14 +636,13 @@ static int init_construction(ir_graph *irg, irg_walk_func *pre) {
 		for (i = j = 0; i < arity; i++) {
 			ir_node *pred = get_End_keepalive(end, i);
 
-			if (get_irn_op(pred) == op_Block) {
-				if (Block_not_block_visited(pred)) {
-					/* we found a endless loop */
-					dec_irg_block_visited(irg);
-					irg_block_walk(pred, pre, NULL, &n_blocks);
-				}
-				else
+			if (is_Block(pred)) {
+				if (Block_block_visited(pred))
 					continue;
+
+				/* we found an endless loop */
+				dec_irg_block_visited(irg);
+				irg_block_walk(pred, pre, NULL, &n_blocks);
 			}
 			in[j++] = pred;
 		}