From 3cf855d349a6587250cc906a0379eac46b0b6e25 Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Sat, 6 Mar 2010 02:29:41 +0000 Subject: [PATCH] BugFix: allow method entities to be initialized by an const_initializer. [r27255] --- ir/tr/entity.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ir/tr/entity.c b/ir/tr/entity.c index 157b74619..dddb2d19d 100644 --- a/ir/tr/entity.c +++ b/ir/tr/entity.c @@ -725,13 +725,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)); 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; -- 2.20.1