Add the return type as parameter to the macros set_find() and set_insert().

[libfirm] / ir / tr / typewalk.c

diff --git a/ir/tr/typewalk.c b/ir/tr/typewalk.c
index 738a02b..dbef3f2 100644 (file)
--- 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:
@@ -256,7 +250,6 @@ static void start_type_walk(ir_node *node, void *ctx)
        irn_type_walker(node, pre, post, envi);
 }
 
-/* walker: walks over all types */
 void type_walk(type_walk_func *pre, type_walk_func *post, void *env)
 {
        size_t      i, n_types = get_irp_n_types();
@@ -537,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);
                }
        }
@@ -547,7 +540,6 @@ void class_walk_super2sub(class_walk_func *pre,
 }
 
 
-/* Walks over all entities in the type */
 void walk_types_entities(ir_type *tp,
                          entity_walk_func *doit,
                          void *env)