*
* @return the new created entity
*/
-static inline ir_entity *
-new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
+static inline ir_entity *new_rd_entity(dbg_info *db, ir_type *owner,
+ ident *name, ir_type *type)
{
ir_entity *res;
ir_graph *rem;
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;
- }
-
#ifdef DEBUG_libfirm
res->nr = get_irp_new_node_nr();
#endif /* DEBUG_libfirm */
return res;
} /* new_rd_entity */
-ir_entity *
-new_d_entity(ir_type *owner, ident *name, ir_type *type, dbg_info *db)
+ir_entity *new_d_entity(ir_type *owner, ident *name, ir_type *type, dbg_info *db)
{
ir_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 */
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)) {
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();
* 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));
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;
- 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);
+ 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);
return newe;
} /* copy_entity_name */
-void
-free_entity(ir_entity *ent)
+void free_entity(ir_entity *ent)
{
assert(ent && ent->kind == k_entity);
free_entity_attrs(ent);
} /* free_entity */
/* 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
#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));
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);
}
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);
}
#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);
}
#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;
}
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);
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 */
{
#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));
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;
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)
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;
}
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++)
}
}
-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)
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;
}
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)
projects / libfirm / blobdiff