X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Fentity.c;h=88d0b991e2e615b641dc407b5e3fac65a1a2a46b;hb=d7925741c820983f9613b519ab215133765a3cb2;hp=8d92a070cf425eb5f8d73aee0a5ad6256a5ef2f4;hpb=ebdaa596d904a0651c8d794481288d2d629bdb3a;p=libfirm

diff --git a/ir/tr/entity.c b/ir/tr/entity.c
index 8d92a070c..88d0b991e 100644
--- a/ir/tr/entity.c
+++ b/ir/tr/entity.c
@@ -60,41 +60,8 @@ ir_entity *get_unknown_entity(void) { return unknown_entity; }
 /* ENTITY                                                          */
 /*-----------------------------------------------------------------*/
 
-/**
- * Add an entity to it's already set owner type.
- */
-static inline void insert_entity_in_owner(ir_entity *ent) {
-	ir_type *owner = ent->owner;
-	switch (get_type_tpop_code(owner)) {
-	case tpo_class:
-		add_class_member(owner, ent);
-		break;
-	case tpo_struct:
-		add_struct_member(owner, ent);
-		break;
-	case tpo_union:
-		add_union_member(owner, ent);
-		break;
-	case tpo_array:
-		set_array_element_entity(owner, ent);
-		break;
-	default:
-		panic("Unsupported type kind");
-	}
-}  /* insert_entity_in_owner */
-
-/**
- * Creates a new entity. This entity is NOT inserted in the owner type.
- *
- * @param db     debug info for this entity
- * @param owner  the owner type of the new entity
- * @param name   the name of the new entity
- * @param type   the type of the new entity
- *
- * @return the new created entity
- */
-static inline ir_entity *
-new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
+ir_entity *new_d_entity(ir_type *owner, ident *name, ir_type *type,
+                        dbg_info *db)
 {
 	ir_entity *res;
 	ir_graph *rem;
@@ -113,6 +80,7 @@ new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
 	res->aligned              = align_is_aligned;
 	res->usage                = ir_usage_unknown;
 	res->compiler_gen         = 0;
+	res->visibility           = ir_visibility_default;
 	res->offset               = -1;
 	res->offset_bit_remainder = 0;
 	res->alignment            = 0;
@@ -129,7 +97,7 @@ new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
 		current_ir_graph        = rem;
 		res->linkage            = IR_LINKAGE_CONSTANT;
 		res->attr.mtd_attr.irg_add_properties = mtp_property_inherited;
-		res->attr.mtd_attr.vtable_number      = VTABLE_NUM_NOT_SET;
+		res->attr.mtd_attr.vtable_number      = IR_VTABLE_NUM_NOT_SET;
 		res->attr.mtd_attr.param_access       = NULL;
 		res->attr.mtd_attr.param_weight       = NULL;
 		res->attr.mtd_attr.irg                = NULL;
@@ -140,41 +108,26 @@ new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
 		res->attr.code_attr.label = (ir_label_t) -1;
 	}
 
-	if (is_Class_type(owner)) {
-		res->overwrites    = NEW_ARR_F(ir_entity *, 0);
-		res->overwrittenby = NEW_ARR_F(ir_entity *, 0);
-	} else {
-		res->overwrites    = NULL;
-		res->overwrittenby = NULL;
-	}
+	/* Remember entity in it's owner. */
+	if (owner != NULL)
+		add_compound_member(owner, res);
 
 #ifdef DEBUG_libfirm
 	res->nr = get_irp_new_node_nr();
-#endif /* DEBUG_libfirm */
+#endif
 
 	res->visit = 0;
 	set_entity_dbg_info(res, db);
 
-	return res;
-}  /* new_rd_entity */
-
-ir_entity *
-new_d_entity(ir_type *owner, ident *name, ir_type *type, dbg_info *db) {
-	ir_entity *res;
-
-	assert(is_compound_type(owner));
-	res = new_rd_entity(db, owner, name, type);
-	/* Remember entity in it's owner. */
-	insert_entity_in_owner(res);
-
 	hook_new_entity(res);
+
 	return res;
-}  /* new_d_entity */
+}
 
-ir_entity *
-new_entity(ir_type *owner, ident *name, ir_type *type) {
+ir_entity *new_entity(ir_type *owner, ident *name, ir_type *type)
+{
 	return new_d_entity(owner, name, type, NULL);
-}  /* new_entity */
+}
 
 /**
  * Free entity attributes.
@@ -183,31 +136,23 @@ new_entity(ir_type *owner, ident *name, ir_type *type) {
  */
 static void free_entity_attrs(ir_entity *ent)
 {
-	int i;
-	if (get_type_tpop(get_entity_owner(ent)) == type_class) {
-		DEL_ARR_F(ent->overwrites);    ent->overwrites = NULL;
-		DEL_ARR_F(ent->overwrittenby); ent->overwrittenby = NULL;
-	} else {
-		assert(ent->overwrites == NULL);
-		assert(ent->overwrittenby == NULL);
+	if (ent->overwrites != NULL) {
+		DEL_ARR_F(ent->overwrites);
+		ent->overwrites = NULL;
 	}
+	if (ent->overwrittenby != NULL) {
+		DEL_ARR_F(ent->overwrittenby);
+		ent->overwrittenby = NULL;
+	}
+
 	if (ent->initializer != NULL) {
 		/* TODO: free initializers */
 	} else if (entity_has_compound_ent_values(ent)) {
-		if (ent->attr.cmpd_attr.val_paths) {
-			for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i)
-				if (ent->attr.cmpd_attr.val_paths[i]) {
-					/* free_compound_graph_path(ent->attr.cmpd_attr.val_paths[i]) ;  * @@@ warum nich? */
-					/* Geht nich: wird mehrfach verwendet!!! ==> mehrfach frei gegeben. */
-					/* DEL_ARR_F(ent->attr.cmpd_attr.val_paths); */
-				}
-				ent->attr.cmpd_attr.val_paths = NULL;
-		}
+		/* can't free compound graph path as it might be used
+		 * multiple times */
+		ent->attr.cmpd_attr.val_paths = NULL;
 	}
 	if (is_compound_entity(ent)) {
-		if (ent->attr.cmpd_attr.values) {
-			/*DEL_ARR_F(ent->attr.cmpd_attr.values)*/;
-		}
 		ent->attr.cmpd_attr.values = NULL;
 	} else if (is_method_entity(ent)) {
 		if (ent->attr.mtd_attr.param_access) {
@@ -219,7 +164,7 @@ static void free_entity_attrs(ir_entity *ent)
 			ent->attr.mtd_attr.param_weight = NULL;
 		}
 	}
-}  /* free_entity_attrs */
+}
 
 /**
  * Creates a deep copy of an entity.
@@ -245,18 +190,21 @@ static ir_entity *deep_entity_copy(ir_entity *old)
 		newe->attr.mtd_attr.param_access = NULL;
 		newe->attr.mtd_attr.param_weight = NULL;
 	}
+	newe->overwrites    = NULL;
+	newe->overwrittenby = NULL;
 
 #ifdef DEBUG_libfirm
 	newe->nr = get_irp_new_node_nr();
 #endif
 	return newe;
 }
+
 /*
  * Copies the entity if the new_owner is different from the
  * owner of the old entity,  else returns the old entity.
  */
-ir_entity *
-copy_entity_own(ir_entity *old, ir_type *new_owner) {
+ir_entity *copy_entity_own(ir_entity *old, ir_type *new_owner)
+{
 	ir_entity *newe;
 	assert(is_entity(old));
 	assert(is_compound_type(new_owner));
@@ -266,80 +214,78 @@ copy_entity_own(ir_entity *old, ir_type *new_owner) {
 		return old;
 
 	/* create a deep copy so we are safe of aliasing and double-freeing. */
-	newe = deep_entity_copy(old);
+	newe        = deep_entity_copy(old);
 	newe->owner = new_owner;
+	add_compound_member(new_owner, newe);
 
-	if (is_Class_type(new_owner)) {
-		newe->overwrites    = NEW_ARR_F(ir_entity *, 0);
-		newe->overwrittenby = NEW_ARR_F(ir_entity *, 0);
-	}
-
-	insert_entity_in_owner(newe);
 	return newe;
-}  /* copy_entity_own */
+}
 
-ir_entity *
-copy_entity_name(ir_entity *old, ident *new_name) {
+ir_entity *copy_entity_name(ir_entity *old, ident *new_name)
+{
 	ir_entity *newe;
 	assert(old && old->kind == k_entity);
 
-	if (old->name == new_name) return old;
-	newe = deep_entity_copy(old);
+	if (old->name == new_name)
+		return old;
+
+	newe       = deep_entity_copy(old);
 	newe->name = new_name;
 	newe->ld_name = NULL;
-
-	if (is_Class_type(newe->owner)) {
-		newe->overwrites    = DUP_ARR_F(ir_entity *, old->overwrites);
-		newe->overwrittenby = DUP_ARR_F(ir_entity *, old->overwrittenby);
-	}
-	insert_entity_in_owner(newe);
+	add_compound_member(old->owner, newe);
 
 	return newe;
-}  /* copy_entity_name */
+}
+
+void free_entity(ir_entity *ent)
+{
+	if (ent->owner != NULL && !is_Array_type(ent->owner))
+		remove_compound_member(ent->owner, ent);
 
-void
-free_entity(ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	free_entity_attrs(ent);
 	ent->kind = k_BAD;
-	free(ent);
-}  /* free_entity */
+	xfree(ent);
+}
 
 /* Outputs a unique number for this node */
-long
-get_entity_nr(const ir_entity *ent) {
+long get_entity_nr(const ir_entity *ent)
+{
 	assert(ent && ent->kind == k_entity);
 #ifdef DEBUG_libfirm
 	return ent->nr;
 #else
 	return (long)PTR_TO_INT(ent);
 #endif
-}  /* get_entity_nr */
+}
 
-const char *
-(get_entity_name)(const ir_entity *ent) {
+const char *(get_entity_name)(const ir_entity *ent)
+{
 	return _get_entity_name(ent);
 }
 
-ident *
-(get_entity_ident)(const ir_entity *ent) {
+ident *(get_entity_ident)(const ir_entity *ent)
+{
 	return _get_entity_ident(ent);
 }
 
-void
-(set_entity_ident)(ir_entity *ent, ident *id) {
+void (set_entity_ident)(ir_entity *ent, ident *id)
+{
 	_set_entity_ident(ent, id);
 }
 
-ir_type *
-(get_entity_owner)(const ir_entity *ent) {
+ir_type *(get_entity_owner)(const ir_entity *ent)
+{
 	return _get_entity_owner(ent);
 }
 
-void
-set_entity_owner(ir_entity *ent, ir_type *owner) {
+void set_entity_owner(ir_entity *ent, ir_type *owner)
+{
 	assert(is_entity(ent));
 	assert(is_compound_type(owner));
+
+	remove_compound_member(ent->owner, ent);
+	add_compound_member(owner, ent);
 	ent->owner = owner;
 }
 
@@ -348,8 +294,8 @@ ident *(get_entity_ld_ident)(const ir_entity *ent)
 	return _get_entity_ld_ident(ent);
 }
 
-void
-(set_entity_ld_ident)(ir_entity *ent, ident *ld_ident) {
+void (set_entity_ld_ident)(ir_entity *ent, ident *ld_ident)
+{
 	_set_entity_ld_ident(ent, ld_ident);
 }
 
@@ -358,23 +304,23 @@ const char *(get_entity_ld_name)(const ir_entity *ent)
 	return _get_entity_ld_name(ent);
 }
 
-ir_type *
-(get_entity_type)(const ir_entity *ent) {
+ir_type *(get_entity_type)(const ir_entity *ent)
+{
 	return _get_entity_type(ent);
 }
 
-void
-(set_entity_type)(ir_entity *ent, ir_type *type) {
+void (set_entity_type)(ir_entity *ent, ir_type *type)
+{
 	_set_entity_type(ent, type);
 }
 
-ir_volatility
-(get_entity_volatility)(const ir_entity *ent) {
+ir_volatility (get_entity_volatility)(const ir_entity *ent)
+{
 	return _get_entity_volatility(ent);
 }
 
-void
-(set_entity_volatility)(ir_entity *ent, ir_volatility vol) {
+void (set_entity_volatility)(ir_entity *ent, ir_volatility vol)
+{
 	_set_entity_volatility(ent, vol);
 }
 
@@ -388,25 +334,25 @@ const char *get_volatility_name(ir_volatility var)
     default: return "BAD VALUE";
 	}
 #undef X
-}  /* get_volatility_name */
+}
 
-ir_align
-(get_entity_aligned)(const ir_entity *ent) {
+ir_align (get_entity_aligned)(const ir_entity *ent)
+{
 	return _get_entity_aligned(ent);
 }
 
-void
-(set_entity_aligned)(ir_entity *ent, ir_align a) {
+void (set_entity_aligned)(ir_entity *ent, ir_align a)
+{
 	_set_entity_aligned(ent, a);
 }
 
-unsigned
-(get_entity_alignment)(const ir_entity *ent) {
+unsigned (get_entity_alignment)(const ir_entity *ent)
+{
 	return _get_entity_alignment(ent);
 }
 
-void
-(set_entity_alignment)(ir_entity *ent, unsigned alignment) {
+void (set_entity_alignment)(ir_entity *ent, unsigned alignment)
+{
 	_set_entity_alignment(ent, alignment);
 }
 
@@ -420,10 +366,9 @@ const char *get_align_name(ir_align a)
 	default: return "BAD VALUE";
 	}
 #undef X
-}  /* get_align_name */
+}
 
-void
-set_entity_label(ir_entity *ent, ir_label_t label)
+void set_entity_label(ir_entity *ent, ir_label_t label)
 {
 	ent->attr.code_attr.label = label;
 }
@@ -433,22 +378,28 @@ ir_label_t get_entity_label(const ir_entity *ent)
 	return ent->attr.code_attr.label;
 }
 
-static void verify_linkage(ir_entity *entity)
+static void verify_visibility(const ir_entity *entity)
 {
-	ir_linkage linkage = entity->linkage;
-	/* local and extern are mutually exclusive */
-	(void) linkage;
-	assert(! ((linkage & IR_LINKAGE_EXTERN) && (linkage & IR_LINKAGE_LOCAL)));
-	if (!is_method_entity(entity) && (linkage & IR_LINKAGE_EXTERN)) {
+	if (get_entity_visibility(entity) == ir_visibility_external
+			&& !is_method_entity(entity)) {
 		assert(!entity_has_definition(entity));
 	}
-	assert(! ((linkage & IR_LINKAGE_CONSTANT) && (linkage & IR_LINKAGE_WEAK)));
+}
+
+void set_entity_visibility(ir_entity *entity, ir_visibility visibility)
+{
+	entity->visibility = visibility;
+	verify_visibility(entity);
+}
+
+ir_visibility get_entity_visibility(const ir_entity *entity)
+{
+	return entity->visibility;
 }
 
 void set_entity_linkage(ir_entity *entity, ir_linkage linkage)
 {
 	entity->linkage = linkage;
-	verify_linkage(entity);
 }
 
 ir_linkage (get_entity_linkage)(const ir_entity *entity)
@@ -459,30 +410,32 @@ ir_linkage (get_entity_linkage)(const ir_entity *entity)
 void add_entity_linkage(ir_entity *entity, ir_linkage linkage)
 {
 	entity->linkage |= linkage;
-	verify_linkage(entity);
 }
 
 void remove_entity_linkage(ir_entity *entity, ir_linkage linkage)
 {
 	entity->linkage &= ~linkage;
-	verify_linkage(entity);
 }
 
 /* Checks if an entity is compiler generated */
-int (is_entity_compiler_generated)(const ir_entity *ent) {
+int (is_entity_compiler_generated)(const ir_entity *ent)
+{
 	return _is_entity_compiler_generated(ent);
-}  /* is_entity_compiler_generated */
+}
 
 /* Sets/resets the compiler generated flag */
-void (set_entity_compiler_generated)(ir_entity *ent, int flag) {
+void (set_entity_compiler_generated)(ir_entity *ent, int flag)
+{
 	_set_entity_compiler_generated(ent, flag);
-}  /* set_entity_compiler_generated */
+}
 
-ir_entity_usage (get_entity_usage)(const ir_entity *ent) {
+ir_entity_usage (get_entity_usage)(const ir_entity *ent)
+{
 	return _get_entity_usage(ent);
 }
 
-void (set_entity_usage)(ir_entity *ent, ir_entity_usage flags) {
+void (set_entity_usage)(ir_entity *ent, ir_entity_usage flags)
+{
 	_set_entity_usage(ent, flags);
 }
 
@@ -521,7 +474,6 @@ void set_atomic_ent_value(ir_entity *entity, ir_node *val)
 	ir_initializer_t *initializer;
 
 	assert(is_atomic_entity(entity));
-	assert(get_entity_peculiarity(entity) != peculiarity_description);
 
 	assert(is_Dummy(val) || get_irn_mode(val) == get_type_mode(entity->type));
 	initializer = create_initializer_const(val);
@@ -530,7 +482,8 @@ void set_atomic_ent_value(ir_entity *entity, ir_node *val)
 
 /* Returns true if the the node is representable as code on
  *  const_code_irg. */
-int is_irn_const_expression(ir_node *n) {
+int is_irn_const_expression(ir_node *n)
+{
 	ir_mode *m;
 
 	/* we are in danger iff an exception will arise. TODO: be more precisely,
@@ -552,13 +505,14 @@ int is_irn_const_expression(ir_node *n) {
 		break;
 	}
 	return 0;
-}  /* is_irn_const_expression */
+}
 
 /*
  * Copies a firm subgraph that complies to the restrictions for
  * constant expressions to current_block in current_ir_graph.
  */
-ir_node *copy_const_value(dbg_info *dbg, ir_node *n) {
+ir_node *copy_const_value(dbg_info *dbg, ir_node *n)
+{
 	ir_node *nn;
 	ir_mode *m;
 
@@ -599,12 +553,10 @@ ir_node *copy_const_value(dbg_info *dbg, ir_node *n) {
 	case iro_Unknown:
 		nn = new_Unknown(m); break;
 	default:
-		assert(0 && "opcode invalid or not implemented");
-		nn = NULL;
-		break;
+		panic("opcode invalid or not implemented");
 	}
 	return nn;
-}  /* copy_const_value */
+}
 
 /** Return the name of the initializer kind. */
 const char *get_initializer_kind_name(ir_initializer_kind_t ini)
@@ -663,7 +615,7 @@ ir_initializer_t *create_initializer_compound(unsigned n_entries)
 	initializer->kind                    = IR_INITIALIZER_COMPOUND;
 	initializer->compound.n_initializers = n_entries;
 
-	for(i = 0; i < n_entries; ++i) {
+	for (i = 0; i < n_entries; ++i) {
 		initializer->compound.initializers[i] = get_initializer_null();
 	}
 
@@ -715,13 +667,17 @@ static void check_entity_initializer(ir_entity *entity)
 {
 #ifndef NDEBUG
 	ir_initializer_t *initializer = entity->initializer;
+	ir_type          *entity_tp   = get_entity_type(entity);
 	switch (initializer->kind) {
 	case IR_INITIALIZER_COMPOUND:
-		assert(is_compound_entity(entity));
+		assert(is_compound_type(entity_tp) || is_Array_type(entity_tp));
 		break;
 	case IR_INITIALIZER_CONST:
+		/* methods are initialized by a SymConst */
+		assert(is_atomic_type(entity_tp) || is_Method_type(entity_tp));
+		break;
 	case IR_INITIALIZER_TARVAL:
-		assert(is_atomic_entity(entity));
+		assert(is_atomic_type(entity_tp));
 		break;
 	case IR_INITIALIZER_NULL:
 		break;
@@ -767,27 +723,26 @@ void (set_entity_offset_bits_remainder)(ir_entity *ent, unsigned char offset)
 
 void add_entity_overwrites(ir_entity *ent, ir_entity *overwritten)
 {
-#ifndef NDEBUG
-	ir_type *owner     = get_entity_owner(ent);
-	ir_type *ovw_ovner = get_entity_owner(overwritten);
-	assert(is_Class_type(owner));
-	assert(is_Class_type(ovw_ovner));
-	assert(! is_class_final(ovw_ovner));
-#endif /* NDEBUG */
+	if (ent->overwrites == NULL) {
+		ent->overwrites = NEW_ARR_F(ir_entity*, 0);
+	}
 	ARR_APP1(ir_entity *, ent->overwrites, overwritten);
+	if (overwritten->overwrittenby == NULL) {
+		overwritten->overwrittenby = NEW_ARR_F(ir_entity*, 0);
+	}
 	ARR_APP1(ir_entity *, overwritten->overwrittenby, ent);
 }
 
 int get_entity_n_overwrites(const ir_entity *ent)
 {
-	assert(is_Class_type(get_entity_owner(ent)));
-	return (ARR_LEN(ent->overwrites));
+	if (ent->overwrites == NULL)
+		return 0;
+	return ARR_LEN(ent->overwrites);
 }
 
 int get_entity_overwrites_index(const ir_entity *ent, ir_entity *overwritten)
 {
 	int i, n;
-	assert(is_Class_type(get_entity_owner(ent)));
 	n = get_entity_n_overwrites(ent);
 	for (i = 0; i < n; ++i) {
 		if (get_entity_overwrites(ent, i) == overwritten)
@@ -798,14 +753,12 @@ int get_entity_overwrites_index(const ir_entity *ent, ir_entity *overwritten)
 
 ir_entity *get_entity_overwrites(const ir_entity *ent, int pos)
 {
-	assert(is_Class_type(get_entity_owner(ent)));
 	assert(pos < get_entity_n_overwrites(ent));
 	return ent->overwrites[pos];
 }
 
 void set_entity_overwrites(ir_entity *ent, int pos, ir_entity *overwritten)
 {
-	assert(is_Class_type(get_entity_owner(ent)));
 	assert(pos < get_entity_n_overwrites(ent));
 	ent->overwrites[pos] = overwritten;
 }
@@ -813,8 +766,7 @@ void set_entity_overwrites(ir_entity *ent, int pos, ir_entity *overwritten)
 void remove_entity_overwrites(ir_entity *ent, ir_entity *overwritten)
 {
 	int i, n;
-	assert(is_Class_type(get_entity_owner(ent)));
-	n = ARR_LEN(ent->overwrites);
+	n = get_entity_n_overwrites(ent);
 	for (i = 0; i < n; ++i) {
 		if (ent->overwrites[i] == overwritten) {
 			for (; i < n - 1; i++)
@@ -825,21 +777,17 @@ void remove_entity_overwrites(ir_entity *ent, ir_entity *overwritten)
 	}
 }
 
-void add_entity_overwrittenby(ir_entity *ent, ir_entity *overwrites)
-{
-	add_entity_overwrites(overwrites, ent);
-}
 
 int get_entity_n_overwrittenby(const ir_entity *ent)
 {
-	assert(is_Class_type(get_entity_owner(ent)));
+	if (ent->overwrittenby == NULL)
+		return 0;
 	return ARR_LEN(ent->overwrittenby);
 }
 
 int get_entity_overwrittenby_index(const ir_entity *ent, ir_entity *overwrites)
 {
 	int i, n;
-	assert(is_Class_type(get_entity_owner(ent)));
 	n = get_entity_n_overwrittenby(ent);
 	for (i = 0; i < n; ++i) {
 		if (get_entity_overwrittenby(ent, i) == overwrites)
@@ -850,14 +798,12 @@ int get_entity_overwrittenby_index(const ir_entity *ent, ir_entity *overwrites)
 
 ir_entity *get_entity_overwrittenby(const ir_entity *ent, int pos)
 {
-	assert(is_Class_type(get_entity_owner(ent)));
 	assert(pos < get_entity_n_overwrittenby(ent));
 	return ent->overwrittenby[pos];
 }
 
 void set_entity_overwrittenby(ir_entity *ent, int pos, ir_entity *overwrites)
 {
-	assert(is_Class_type(get_entity_owner(ent)));
 	assert(pos < get_entity_n_overwrittenby(ent));
 	ent->overwrittenby[pos] = overwrites;
 }
@@ -865,12 +811,11 @@ void set_entity_overwrittenby(ir_entity *ent, int pos, ir_entity *overwrites)
 void remove_entity_overwrittenby(ir_entity *ent, ir_entity *overwrites)
 {
 	int i, n;
-	assert(is_Class_type(get_entity_owner(ent)));
 
-	n = ARR_LEN(ent->overwrittenby);
+	n = get_entity_n_overwrittenby(ent);
 	for (i = 0; i < n; ++i) {
 		if (ent->overwrittenby[i] == overwrites) {
-			for(; i < n - 1; ++i)
+			for (; i < n - 1; ++i)
 				ent->overwrittenby[i] = ent->overwrittenby[i+1];
 			ARR_SETLEN(ir_entity*, ent->overwrittenby, n - 1);
 			break;
@@ -1015,8 +960,8 @@ void set_entity_additional_property(ir_entity *ent, mtp_additional_property flag
 		if (mask & mtp_property_inherited)
 			mask = get_method_additional_properties(get_entity_type(ent));
 
-			/* do not allow to set the mtp_property_inherited flag or
-		* the automatic inheritance of flags will not work */
+		/* do not allow to set the mtp_property_inherited flag or
+		 * the automatic inheritance of flags will not work */
 		ent->attr.mtd_attr.irg_add_properties = mask | (flag & ~mtp_property_inherited);
 	}
 }
@@ -1040,7 +985,8 @@ void (set_entity_dbg_info)(ir_entity *ent, dbg_info *db)
 
 int entity_is_externally_visible(const ir_entity *entity)
 {
-	return (get_entity_linkage(entity) & IR_LINKAGE_LOCAL) == 0;
+	return get_entity_visibility(entity) != ir_visibility_local
+		|| (get_entity_linkage(entity) & IR_LINKAGE_HIDDEN_USER);
 }
 
 int entity_has_definition(const ir_entity *entity)
@@ -1050,20 +996,23 @@ int entity_has_definition(const ir_entity *entity)
 		|| entity_has_compound_ent_values(entity);
 }
 
-void firm_init_entity(void)
+void ir_init_entity(void)
 {
-	symconst_symbol sym;
-
 	assert(firm_unknown_type && "Call init_type() before firm_init_entity()!");
 	assert(!unknown_entity && "Call firm_init_entity() only once!");
 
-	unknown_entity = new_rd_entity(NULL, firm_unknown_type, new_id_from_str(UNKNOWN_ENTITY_NAME), firm_unknown_type);
-	set_entity_linkage(unknown_entity, IR_LINKAGE_EXTERN);
-
+	unknown_entity = new_d_entity(NULL, new_id_from_str(UNKNOWN_ENTITY_NAME),
+	                              firm_unknown_type, NULL);
+	set_entity_visibility(unknown_entity, ir_visibility_external);
 	set_entity_ld_ident(unknown_entity, get_entity_ident(unknown_entity));
+}
 
-	current_ir_graph = get_const_code_irg();
-	sym.entity_p     = unknown_entity;
+void ir_finish_entity(void)
+{
+	if (unknown_entity != NULL) {
+		free_entity(unknown_entity);
+		unknown_entity = NULL;
+	}
 }
 
 ir_allocation get_entity_allocation(const ir_entity *entity)