X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=0cfb3f46cea75c03af69a64223d2f7206c7ee362;hb=bd019d8cd785c1a433c19dee44bf3f9e82397286;hp=ef85c0ca6ce633bffb6f0a1a32b99a03d4d94202;hpb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;p=libfirm

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index ef85c0ca6..0cfb3f46c 100644
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -180,7 +180,8 @@ static void remove_empty_block(ir_node *block)
 
 		assert(succ_block == NULL);
 		succ_block = get_edge_src_irn(edge);
-		if (has_Block_entity(succ_block) && has_Block_entity(block)) {
+		if (get_Block_entity(succ_block) != NULL
+		    && get_Block_entity(block) != NULL) {
 			/*
 			 * Currently we can add only one label for a block.
 			 * Therefore we cannot combine them if  both block already have one.
@@ -191,7 +192,7 @@ static void remove_empty_block(ir_node *block)
 		set_irn_n(succ_block, pos, pred);
 	}
 
-	if (has_Block_entity(block)) {
+	if (get_Block_entity(block) != NULL) {
 		/* move the label to the successor block */
 		ir_entity *entity = get_Block_entity(block);
 		set_Block_entity(succ_block, entity);