X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcombo.c;h=505e24bebb25855c0b25e36b5a2a494ea6c8effa;hb=8c9921a1fc166552f6e416434fd8394a4fc210a3;hp=ba7deb522d89e53e9a6b79a4e8fed9f8a8041dd1;hpb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;p=libfirm

diff --git a/ir/opt/combo.c b/ir/opt/combo.c
index ba7deb522..505e24beb 100644
--- a/ir/opt/combo.c
+++ b/ir/opt/combo.c
@@ -454,9 +454,9 @@ static void dump_split_list(const partition_t *list)
 /**
  * Dump partition and type for a node.
  */
-static int dump_partition_hook(FILE *F, ir_node *n, ir_node *local)
+static int dump_partition_hook(FILE *F, const ir_node *n, const ir_node *local)
 {
-	ir_node *irn = local != NULL ? local : n;
+	const ir_node *irn = local != NULL ? local : n;
 	node_t *node = get_irn_node(irn);
 
 	ir_fprintf(F, "info2 : \"partition %u type %+F\"\n", node->part->nr, node->type);
@@ -1929,7 +1929,7 @@ static void compute_Block(node_t *node)
 	int     i;
 	ir_node *block = node->node;
 
-	if (block == get_irg_start_block(current_ir_graph) || has_Block_entity(block)) {
+	if (block == get_irg_start_block(current_ir_graph) || get_Block_entity(block) != NULL) {
 		/* start block and labelled blocks are always reachable */
 		node->type.tv = tarval_reachable;
 		return;
@@ -2990,7 +2990,7 @@ static int only_one_reachable_proj(ir_node *n)
  */
 static int can_exchange(ir_node *pred, ir_node *block)
 {
-	if (is_Start(pred) || has_Block_entity(block))
+	if (is_Start(pred) || get_Block_entity(block) != NULL)
 		return 0;
 	else if (is_Jmp(pred))
 		return 1;