X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftypewalk.c;h=dbef3f2d63deae4bf9606c1d64a3986c86c80a9e;hb=e54d8b0aab01346d1c0e5d81e3db1b18ddcc87f7;hp=50055c30107369faf5e70de788881c8d20f858e3;hpb=02f098c997643c82451cd29b6c44d8a75cb4d8d8;p=libfirm diff --git a/ir/tr/typewalk.c b/ir/tr/typewalk.c index 50055c301..dbef3f2d6 100644 --- a/ir/tr/typewalk.c +++ b/ir/tr/typewalk.c @@ -41,6 +41,7 @@ #include "irnode_t.h" #include "irgwalk.h" #include "error.h" +#include "ircons.h" /** * The walker environment @@ -92,7 +93,6 @@ static void do_type_walk(type_or_ent tore, size_t i, n_types, n_mem; ir_entity *ent = NULL; ir_type *tp = NULL; - ir_node *n; type_or_ent cont; /* marked? */ @@ -128,12 +128,6 @@ static void do_type_walk(type_or_ent tore, /* walk over the value types */ if (ent->initializer != NULL) { walk_initializer(ent->initializer, pre, post, env); - } else if (entity_has_compound_ent_values(ent)) { - size_t i, n_mem = get_compound_ent_n_values(ent); - for (i = 0; i < n_mem; ++i) { - n = get_compound_ent_value(ent, i); - irn_type_walker(n, pre, post, env); - } } break; case k_type: @@ -536,9 +530,9 @@ void class_walk_super2sub(class_walk_func *pre, tp = get_irp_type(i); if (is_Class_type(tp) && (get_class_n_supertypes(tp) == 0) && - type_not_visited(tp)) { - assert(! is_frame_type(tp)); - assert(tp != get_glob_type()); + type_not_visited(tp) && + (! is_frame_type(tp)) && + (tp != get_glob_type())) { class_walk_s2s_2(tp, pre, post, env); } }