Rework Block labels: They are entities now so we don't need a special symconst type for them

[r26080]

include/libfirm/firm_types.h

@@ -160,9 +160,8 @@ typedef enum {
 	                           symconst_symbol is entity *. */
 	symconst_ofs_ent,     /**< The SymConst is the offset of its entity in the entities
 	                           owner type. */
-	symconst_enum_const,  /**< The SymConst is a enumeration constant of an
+	symconst_enum_const   /**< The SymConst is a enumeration constant of an
 	                           enumeration type. */
-	symconst_label        /**< The SymConst is a label address. */
 } symconst_kind;
 
 /** SymConst attribute.
@@ -174,7 +173,6 @@ typedef union symconst_symbol {
 	ident         *ident_p;   /**< The ident of a SymConst. */
 	ir_entity     *entity_p;  /**< The entity of a SymConst. */
 	ir_enum_const *enum_p;    /**< The enumeration constant of a SymConst. */
-	ir_label_t    label;      /**< The label of a SymConst. */
 } symconst_symbol;
 
 /**

include/libfirm/irnode.h

@@ -419,12 +419,14 @@ void set_Block_MacroBlock(ir_node *block, ir_node *mbh);
 ir_node *get_irn_MacroBlock(const ir_node *n);
 /** Returns the ir_graph this Block belongs to. */
 ir_graph *get_Block_irg(const ir_node *block);
-/** Returns non-zero if the block has an assigned label. */
-int has_Block_label(const ir_node *block);
-/** Returns the label of a Block. */
-ir_label_t get_Block_label(const ir_node *block);
-/** Sets a label to a block. */
-void set_Block_label(ir_node *block, ir_label_t label);
+/** Returns non-zero if the block has an entity assigned */
+int has_Block_entity(const ir_node *block);
+/** Returns the entity for a Block */
+ir_entity *get_Block_entity(const ir_node *block);
+/** Returns the entity for a Block (creating it if necessary) */
+ir_entity *create_Block_entity(ir_node *block);
+/** Set a new entity for a block */
+void set_Block_entity(ir_node *block, ir_entity *entity);
 /** Gets the head of the Phi list for this block. */
 ir_node *get_Block_phis(const ir_node *block);
 /** Sets the head of the Phi list for this block. */
@@ -552,9 +554,6 @@ void     set_Const_type(ir_node *node, ir_type *tp);
 /** Returns non-zero if s symconst kind has an enum_const attribute */
 #define SYMCONST_HAS_ENUM(kind) ((kind) == symconst_enum_const)
 
-/** Returns non-zero if s symconst kind has a label attribute */
-#define SYMCONST_HAS_LABEL(kind) ((kind) == symconst_label)
-
 /** Get the kind of the SymConst. */
 symconst_kind get_SymConst_kind(const ir_node *node);
 /** Set the kind of the SymConst. */
@@ -583,11 +582,6 @@ union symconst_symbol get_SymConst_symbol(const ir_node *node);
 void                  set_SymConst_symbol(ir_node *node,
                                           union symconst_symbol sym);
 
-/** Only to access SymConst of kind symconst_label.  Else assertion: */
-ir_label_t get_SymConst_label(const ir_node *node);
-void       set_SymConst_label(ir_node *node, ir_label_t label);
-
-
 /** Access the type of the value represented by the SymConst.
  *
  *  Example: primitive type int for SymConst size. */

include/libfirm/typerep.h

@@ -360,6 +360,11 @@ int is_entity_final(const ir_entity *ent);
 /** Sets/resets the final flag of an entity. */
 void set_entity_final(ir_entity *ent, int final);
 
+/** Set label number of an entity with code type */
+void set_entity_label(ir_entity *ent, ir_label_t label);
+/** Return label number of an entity with code type */
+ir_label_t get_entity_label(const ir_entity *ent);
+
 /** Checks if an entity is compiler generated. */
 int is_entity_compiler_generated(const ir_entity *ent);
 
@@ -767,6 +772,7 @@ typedef enum {
 	tpo_pointer,             /**< A pointer type. */
 	tpo_primitive,           /**< A primitive type. */
 	tpo_id,                  /**< Special Id tag used for type replacement. */
+	tpo_code,                /**< a piece of code (a basic block) */
 	tpo_none,                /**< Special type for the None type. */
 	tpo_unknown,             /**< Special code for the Unknown type. */
 	tpo_max                  /* not a type opcode */
@@ -915,6 +921,12 @@ const tp_op *get_tpop_primitive(void);
 extern const tp_op *type_id;
 const tp_op *get_tpop_id(void);
 
+/**
+ * The code type is used to mark pieces of code (basic blocks)
+ */
+extern const tp_op *tpop_code;
+const tp_op *get_tpop_code_type(void);
+
 /**
  * This type opcode is an auxiliary opcode dedicated to support type analyses.
  *
@@ -2295,8 +2307,13 @@ void set_primitive_base_type(ir_type *tp, ir_type *base_tp);
 /** A variable that contains the only none type. */
 extern ir_type *firm_none_type;
 
+/** A variable that contains the only code type. */
+extern ir_type *firm_code_type;
+
 /** Returns the none type. */
 ir_type *get_none_type(void);
+/** Returns the code type. */
+ir_type *get_code_type(void);
 
 /**
  * @page unknown_type  The Unknown type
@@ -2368,6 +2385,11 @@ int get_compound_member_index(const ir_type *tp, ir_entity *member);
  */
 int is_compound_type(const ir_type *tp);
 
+/**
+ * Checks wether a type is a code type.
+ */
+int is_code_type(const ir_type *tp);
+
 /**
  * Checks, whether a type is a frame type.
  */

ir/be/arm/arm_emitter.c

@@ -330,9 +330,9 @@ static ir_node *get_cfop_target_block(const ir_node *irn) {
  * Emits a block label for the given block.
  */
 static void arm_emit_block_name(const ir_node *block) {
-	if (has_Block_label(block)) {
-		be_emit_string(be_gas_block_label_prefix());
-		be_emit_irprintf("%lu", get_Block_label(block));
+	if (has_Block_entity(block)) {
+		ir_entity *entity = get_Block_entity(block);
+		be_gas_emit_entity(entity);
 	} else {
 		be_emit_cstring(BLOCK_PREFIX);
 		be_emit_irprintf("%d", get_irn_node_nr(block));

ir/be/beabi.c

@@ -2210,8 +2210,7 @@ static ir_entity *get_pic_symbol(be_main_env_t *env, ir_entity *entity)
  */
 static int can_address_relative(ir_entity *entity)
 {
-	return get_entity_variability(entity) == variability_initialized
-		&& get_entity_visibility(entity) != visibility_external_allocated;
+	return get_entity_visibility(entity) != visibility_external_allocated;
 }
 
 /** patches SymConsts to work in position independent code */

ir/be/beemitter.h

@@ -41,8 +41,6 @@ extern struct obstack  emit_obst;
 
 /**
  * Emit a character to the (assembler) output.
- *
- * @param env  the emitter environment
  */
 static inline void be_emit_char(char c)
 {
@@ -52,7 +50,6 @@ static inline void be_emit_char(char c)
 /**
  * Emit a string to the (assembler) output.
  *
- * @param env  the emitter environment
  * @param str  the string
  * @param l    the length of the given string
  */
@@ -64,7 +61,6 @@ static inline void be_emit_string_len(const char *str, size_t l)
 /**
  * Emit a null-terminated string to the (assembler) output.
  *
- * @param env  the emitter environment
  * @param str  the null-terminated string
  */
 static inline void be_emit_string(const char *str)
@@ -76,7 +72,6 @@ static inline void be_emit_string(const char *str)
 /**
  * Emit a C string-constant to the (assembler) output.
  *
- * @param env  the emitter environment
  * @param str  the null-terminated string constant
  */
 #define be_emit_cstring(str) \
@@ -85,22 +80,18 @@ static inline void be_emit_string(const char *str)
 /**
  * Initializes an emitter environment.
  *
- * @param env  the (uninitialized) emitter environment
  * @param F    a file handle where the emitted file is written to.
  */
 void be_emit_init(FILE *F);
 
 /**
  * Destroys the given emitter environment.
- *
- * @param env  the emitter environment
  */
 void be_emit_exit(void);
 
 /**
  * Emit an ident to the (assembler) output.
  *
- * @param env  the emitter environment
  * @param id   the ident to be emitted
  */
 void be_emit_ident(ident *id);
@@ -108,7 +99,6 @@ void be_emit_ident(ident *id);
 /**
  * Emit a firm tarval.
  *
- * @param env  the emitter environment
  * @param tv   the tarval to be emitted
  */
 void be_emit_tarval(tarval *tv);
@@ -116,7 +106,6 @@ void be_emit_tarval(tarval *tv);
 /**
  * Emit the output of an ir_printf.
  *
- * @param env  the emitter environment
  * @param fmt  the ir_printf format
  */
 void be_emit_irprintf(const char *fmt, ...);
@@ -124,15 +113,12 @@ void be_emit_irprintf(const char *fmt, ...);
 /**
  * Emit the output of an ir_vprintf.
  *
- * @param env  the emitter environment
  * @param fmt  the ir_printf format
  */
 void be_emit_irvprintf(const char *fmt, va_list args);
 
 /**
  * Flush the line in the current line buffer to the emitter file.
- *
- * @param env  the emitter environment
  */
 void be_emit_write_line(void);
 
@@ -140,15 +126,12 @@ void be_emit_write_line(void);
  * Flush the line in the current line buffer to the emitter file and
  * appends a gas-style comment with the node number and writes the line
  *
- * @param env   the emitter environment
  * @param node  the node to get the debug info from
  */
 void be_emit_finish_line_gas(const ir_node *node);
 
 /**
  * Emit spaces until the comment position is reached.
- *
- * @param env  the emitter environment
  */
 void be_emit_pad_comment(void);
 

ir/be/begnuas.c

@@ -293,11 +293,15 @@ const char *be_gas_insn_label_prefix(void) {
 	return ".LE";
 }
 
-/**
- * Dump a label.
- */
-static void dump_label(ir_label_t label) {
-	be_emit_irprintf("%s%lu", be_gas_block_label_prefix(), label);
+void be_gas_emit_entity(ir_entity *entity)
+{
+	if (entity->type == firm_code_type) {
+		ir_label_t label = get_entity_label(entity);
+		be_emit_string(be_gas_block_label_prefix());
+		be_emit_irprintf("%lu", label);
+	} else {
+		be_emit_ident(get_entity_ld_ident(entity));
+	}
 }
 
 /**
@@ -339,9 +343,6 @@ static tarval *get_atomic_init_tv(ir_node *init)
 			case symconst_enum_const:
 				return get_enumeration_value(get_SymConst_enum(init));
 
-			case symconst_label:
-				return NULL;
-
 			default:
 				return NULL;
 			}
@@ -363,7 +364,6 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 	ir_mode *mode = get_irn_mode(init);
 	int bytes     = get_mode_size_bytes(mode);
 	tarval *tv;
-	ir_label_t label;
 	ir_entity *ent;
 
 	init = skip_Id(init);
@@ -396,17 +396,11 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 				waitq_put(env->worklist, ent);
 				set_entity_backend_marked(ent, 1);
 			}
-			be_emit_ident(get_entity_ld_ident(ent));
+			be_gas_emit_entity(ent);
 			break;
 
 		case symconst_ofs_ent:
 			ent = get_SymConst_entity(init);
-#if 0       /* not needed, is it? */
-			if (!is_entity_backend_marked(ent)) {
-				waitq_put(env->worklist, ent);
-				set_entity_backend_marked(ent, 1);
-			}
-#endif
 			be_emit_irprintf("%d", get_entity_offset(ent));
 			break;
 
@@ -423,11 +417,6 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 			dump_arith_tarval(tv, bytes);
 			break;
 
-		case symconst_label:
-			label = get_SymConst_label(init);
-			dump_label(label);
-			break;
-
 		default:
 			assert(!"dump_atomic_init(): don't know how to init from this SymConst");
 		}

ir/be/begnuas.h

@@ -71,6 +71,11 @@ extern be_gas_flavour_t be_gas_flavour;
 void be_gas_emit_decls(const be_main_env_t *main_env,
                        int only_emit_marked_entities);
 
+/**
+ * Emit an entity (the entities name or a block label)
+ */
+void be_gas_emit_entity(ir_entity *entity);
+
 /**
  * Switch the current output section to the given out.
  *

ir/be/beirgmod.c

@@ -184,7 +184,7 @@ static void remove_empty_block(ir_node *block)
 
 		assert(succ_block == NULL);
 		succ_block = get_edge_src_irn(edge);
-		if (has_Block_label(succ_block) && has_Block_label(block)) {
+		if (has_Block_entity(succ_block) && has_Block_entity(block)) {
 			/*
 			 * Currently we can add only one label for a block.
 			 * Therefore we cannot combine them if  both block already have one.
@@ -195,10 +195,10 @@ static void remove_empty_block(ir_node *block)
 		set_irn_n(succ_block, pos, pred);
 	}
 
-	if (has_Block_label(block)) {
+	if (has_Block_entity(block)) {
 		/* move the label to the successor block */
-		ir_label_t label = get_Block_label(block);
-		set_Block_label(succ_block, label);
+		ir_entity *entity = get_Block_entity(block);
+		set_Block_entity(succ_block, entity);
 	}
 
 	/* there can be some non-scheduled Pin nodes left in the block, move them

ir/be/benewalloc.c

@@ -357,9 +357,11 @@ static void assign_reg(const ir_node *block, ir_node *node)
 	/* give should_be_same boni */
 	info = get_allocation_info(node);
 	req  = arch_get_register_req_out(node);
+
+	ir_node *in_node = skip_Proj(node);
 	if (req->type & arch_register_req_type_should_be_same) {
 		float weight = get_block_execfreq(execfreqs, block);
-		int   arity  = get_irn_arity(node);
+		int   arity  = get_irn_arity(in_node);
 		int   i;
 
 		assert(arity <= (int) sizeof(req->other_same) * 8);
@@ -370,7 +372,7 @@ static void assign_reg(const ir_node *block, ir_node *node)
 			if (!rbitset_is_set(&req->other_same, i))
 				continue;
 
-			in  = get_irn_n(node, i);
+			in  = get_irn_n(in_node, i);
 			reg = arch_get_irn_register(in);
 			assert(reg != NULL);
 			r = arch_register_get_index(reg);

ir/be/ia32/ia32_emitter.c

@@ -102,6 +102,9 @@ static int block_needs_label(const ir_node *block)
 	int need_label = 1;
 	int  n_cfgpreds = get_Block_n_cfgpreds(block);
 
+	if (has_Block_entity(block))
+		return 1;
+
 	if (n_cfgpreds == 0) {
 		need_label = 0;
 	} else if (n_cfgpreds == 1) {
@@ -277,11 +280,8 @@ void ia32_emit_source_register(const ir_node *node, int pos)
 
 static void ia32_emit_entity(ir_entity *entity, int no_pic_adjust)
 {
-	ident *id;
-
 	set_entity_backend_marked(entity, 1);
-	id = get_entity_ld_ident(entity);
-	be_emit_ident(id);
+	be_gas_emit_entity(entity);
 
 	if (get_entity_owner(entity) == get_tls_type()) {
 		if (get_entity_visibility(entity) == visibility_external_allocated) {
@@ -497,9 +497,9 @@ static ir_node *get_cfop_target_block(const ir_node *irn)
  */
 static void ia32_emit_block_name(const ir_node *block)
 {
-	if (has_Block_label(block)) {
-		be_emit_string(be_gas_block_label_prefix());
-		be_emit_irprintf("%lu", get_Block_label(block));
+	if (has_Block_entity(block)) {
+		ir_entity *entity = get_Block_entity(block);
+		be_gas_emit_entity(entity);
 	} else {
 		be_emit_cstring(BLOCK_PREFIX);
 		be_emit_irprintf("%ld", get_irn_node_nr(block));
@@ -2058,7 +2058,7 @@ static void ia32_emit_block_header(ir_node *block)
 		}
 	}
 
-	if (need_label || has_Block_label(block)) {
+	if (need_label) {
 		ia32_emit_block_name(block);
 		be_emit_char(':');
 

ir/be/mips/mips_emitter.c

@@ -423,9 +423,9 @@ const char* mips_get_block_label(const ir_node* block)
  */
 static void mips_emit_block_label(const ir_node *block)
 {
-	if (has_Block_label(block)) {
-		be_emit_string(be_gas_block_label_prefix());
-		be_emit_irprintf("%lu", get_Block_label(block));
+	if (has_Block_entity(block)) {
+		ir_entity *entity = get_Block_entity(block);
+		be_gas_emit_entity(entity);
 	} else {
 		be_emit_cstring(BLOCK_PREFIX);
 		be_emit_irprintf("%ld", get_irn_node_nr(block));

ir/ir/ircons.c

@@ -1284,7 +1284,6 @@ new_d_immBlock(dbg_info *db) {
 	res->attr.block.is_matured  = 0;
 	res->attr.block.is_dead     = 0;
 	res->attr.block.is_mb_head  = 1;
-	res->attr.block.has_label   = 0;
 	res->attr.block.irg         = current_ir_graph;
 	res->attr.block.backedge    = NULL;
 	res->attr.block.in_cg       = NULL;
@@ -1292,7 +1291,7 @@ new_d_immBlock(dbg_info *db) {
 	res->attr.block.extblk      = NULL;
 	res->attr.block.region      = NULL;
 	res->attr.block.mb_depth    = 0;
-	res->attr.block.label       = 0;
+	res->attr.block.entity      = NULL;
 
 	set_Block_block_visited(res, 0);
 

ir/ir/irdump.c

@@ -759,9 +759,6 @@ int dump_node_opcode(FILE *F, ir_node *n)
 		case symconst_enum_const:
 			fprintf(F, "SymC %s enum", get_enumeration_name(get_SymConst_enum(n)));
 			break;
-		case symconst_label:
-			fprintf(F, "SymC %lu label", get_SymConst_label(n));
-			break;
 		}
 		break;
 

ir/ir/irdumptxt.c

@@ -195,8 +195,8 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
 	/* Source types */
 	switch (get_irn_opcode(n)) {
 	case iro_Block: {
-		if (has_Block_label(n))
-			fprintf(F, "  Label: %lu\n", get_Block_label(n));
+		if (has_Block_entity(n))
+			fprintf(F, "  Label: %lu\n", get_entity_label(get_Block_entity(n)));
 		ir_fprintf(F, "  macro Block: %+F\n", get_Block_MacroBlock(n));
 		fprintf(F, "  block visited: %ld\n", get_Block_block_visited(n));
 		fprintf(F, "  block marked: %u\n", get_Block_mark(n));
@@ -344,10 +344,6 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
 			fprintf(F, "  kind: enumeration\n");
 			fprintf(F, "  name: %s\n", get_enumeration_name(get_SymConst_enum(n)));
 			break;
-		case symconst_label:
-			fprintf(F, "  kind: label\n");
-			fprintf(F, "  label: %lu\n", get_SymConst_label(n));
-			break;
 		}
 		fprintf(F, "  type of value: %s \n", get_type_name_ex(get_SymConst_value_type(n), &bad));
 	} break;

ir/ir/irnode.c

@@ -808,20 +808,41 @@ ir_graph *get_Block_irg(const ir_node *block) {
 	return block->attr.block.irg;
 }
 
-int has_Block_label(const ir_node *block) {
+ir_entity *create_Block_entity(ir_node *block) {
+	ir_entity *entity;
 	assert(is_Block(block));
-	return block->attr.block.has_label;
+
+	entity = block->attr.block.entity;
+	if (entity == NULL) {
+		ir_label_t  nr;
+		ir_type   *glob;
+
+		glob = get_glob_type();
+		entity = new_entity(glob, id_unique("block_%u"), get_code_type());
+		nr = get_irp_next_label_nr();
+		set_entity_label(entity, nr);
+		set_entity_compiler_generated(entity, 1);
+
+		block->attr.block.entity = entity;
+	}
+	return entity;
 }
 
-ir_label_t get_Block_label(const ir_node *block) {
+ir_entity *get_Block_entity(const ir_node *block) {
 	assert(is_Block(block));
-	return block->attr.block.label;
+	return block->attr.block.entity;
 }
 
-void set_Block_label(ir_node *block, ir_label_t label) {
+void set_Block_entity(ir_node *block, ir_entity *entity)
+{
 	assert(is_Block(block));
-	block->attr.block.has_label = 1;
-	block->attr.block.label = label;
+	assert(get_entity_type(entity) == get_code_type());
+	block->attr.block.entity = entity;
+}
+
+int has_Block_entity(const ir_node *block)
+{
+	return block->attr.block.entity != NULL;
 }
 
 ir_node *(get_Block_phis)(const ir_node *block) {
@@ -1218,16 +1239,6 @@ set_SymConst_symbol(ir_node *node, union symconst_symbol sym) {
 	node->attr.symc.sym = sym;
 }
 
-ir_label_t get_SymConst_label(const ir_node *node) {
-	assert(is_SymConst(node) && SYMCONST_HAS_LABEL(get_SymConst_kind(node)));
-	return node->attr.symc.sym.label;
-}
-
-void set_SymConst_label(ir_node *node, ir_label_t label) {
-	assert(is_SymConst(node) && SYMCONST_HAS_LABEL(get_SymConst_kind(node)));
-	node->attr.symc.sym.label = label;
-}
-
 ir_type *
 get_SymConst_value_type(ir_node *node) {
 	assert(is_SymConst(node));

ir/ir/iropt.c

@@ -758,7 +758,7 @@ static ir_node *equivalent_node_Block(ir_node *n)
 	int     n_preds;
 
 	/* don't optimize dead or labeled blocks */
-	if (is_Block_dead(n) || has_Block_label(n))
+	if (is_Block_dead(n) || has_Block_entity(n))
 		return n;
 
 	n_preds = get_Block_n_cfgpreds(n);
@@ -6759,13 +6759,8 @@ static unsigned hash_Const(const ir_node *node) {
 static unsigned hash_SymConst(const ir_node *node) {
 	unsigned h;
 
-	/* special value for const, as they only differ in their symbol. */
-	if (node->attr.symc.kind == symconst_label)
-		h = (unsigned)node->attr.symc.sym.label;
-	else {
-		/* all others are pointers */
-		h = HASH_PTR(node->attr.symc.sym.type_p);
-	}
+	/* all others are pointers */
+	h = HASH_PTR(node->attr.symc.sym.type_p);
 
 	return h;
 }  /* hash_SymConst */

ir/ir/irtypes.h

@@ -128,7 +128,6 @@ typedef struct {
 	unsigned is_matured:1;      /**< If set, all in-nodes of the block are fixed. */
 	unsigned is_dead:1;         /**< If set, the block is dead (and could be replace by a Bad. */
 	unsigned is_mb_head:1;      /**< Set if this block is a macroblock head. */
-	unsigned has_label:1;       /**< Set if this block has a label assigned. */
 	unsigned marked:1;          /**< Can be set/unset to temporary mark a block. */
 	ir_node **graph_arr;        /**< An array to store all parameters. */
 	/* Attributes holding analyses information */
@@ -146,7 +145,7 @@ typedef struct {
 	ir_extblk *extblk;          /**< The extended basic block this block belongs to. */
 	ir_region *region;          /**< The immediate structural region this block belongs to. */
 	unsigned mb_depth;          /**< The macroblock depth: A distance from the macroblock header */
-	ir_label_t label;           /**< The block label if assigned. */
+	ir_entity *entity;          /**< entitiy representing this block */
 	ir_node  *phis;             /**< The list of Phi nodes in this block. */
 
 	struct list_head succ_head; /**< A list head for all successor edges of a block. */

ir/lower/lower_hl.c

@@ -303,9 +303,6 @@ static void lower_symconst(ir_node *symc) {
 		hook_lower(symc);
 		exchange(symc, newn);
 		break;
-	case symconst_label:
-		/* leave */
-		break;
 
 	default:
 		assert(!"unknown SymConst kind");

ir/opt/cfopt.c

@@ -225,7 +225,7 @@ static void remove_unreachable_blocks_and_conds(ir_node *block, void *env) {
 	*changed |= remove_senseless_conds(block);
 
 	/* clear the block mark of all non labeled blocks */
-	if (has_Block_label(block))
+	if (has_Block_entity(block))
 		set_Block_non_removable(block);
 	else
 		set_Block_removable(block);
@@ -244,7 +244,7 @@ static void collect_nodes(ir_node *n, void *ctx) {
 
 	if (code == iro_Block) {
 		/* mark the block as non-removable if it is labeled */
-		if (has_Block_label(n))
+		if (has_Block_entity(n))
 			set_Block_non_removable(n);
 	} else {
 		ir_node *b = get_nodes_block(n);
@@ -562,7 +562,7 @@ static void optimize_blocks(ir_node *b, void *ctx) {
 			/* case 1: Do nothing */
 		} 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 || has_Block_label(b));
+			assert(get_Block_n_cfgpreds(b) > 1 || has_Block_entity(b));
 			/* Else it should be optimized by equivalent_node. */
 			for (j = 0; j < get_Block_n_cfgpreds(pred); j++) {