cleanup: Remove pointless assert(is_${NODE}(x)) just before get_${NODE}_${FOO}(x...
[libfirm] / ir / tr / typewalk.c
index f1b3bcb..2f07ca9 100644 (file)
-/* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Author: Goetz Lindenmaier
-**
-** traverse the type information.  The walker walks the whole ir graph
-** to find the distinct type trees in the type graph forest.
-** - execute the pre function before recursion
-** - execute the post function after recursion
-*/
-
-/* $Id$ */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+/*
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file    typewalk.c
+ * @brief   Functionality to modify the type graph.
+ * @author  Goetz Lindenmaier
+ * @brief
+ *
+ * Traverse the type information.  The walker walks the whole ir graph
+ * to find the distinct type trees in the type graph forest.
+ * - execute the pre function before recursion
+ * - execute the post function after recursion
+ */
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "irgwalk.h"
-#include "irgraph_t.h"
-#include "irnode.h"
-#include "irprog.h"
-#include "type_or_entity.h"
-#include "typegmod.h"
 
-/* Make types visible to allow most efficient access */
 #include "entity_t.h"
 #include "type_t.h"
 
+#include "irprog_t.h"
+#include "irgraph_t.h"
+#include "irnode_t.h"
+#include "irgwalk.h"
+#include "error.h"
+#include "ircons.h"
+
+/**
+ * The walker environment
+ */
 typedef struct type_walk_env {
-  void *pre;
-  void *post;
-  void *env;
+       type_walk_func *pre;    /**< Pre-walker function */
+       type_walk_func *post;   /**< Post-walker function */
+       void *env;              /**< environment for walker functions */
 } type_walk_env;
 
+/* a walker for irn's */
+static void irn_type_walker(
+       ir_node *node, type_walk_func *pre, type_walk_func *post, void *env);
 
-void type_walk_2(type_or_ent *tore,
-              void (pre)(type_or_ent*, void*),
-              void (post)(type_or_ent*, void*),
-              void *env)
+static void walk_initializer(ir_initializer_t *initializer,
+                             type_walk_func *pre, type_walk_func *post,
+                             void *env)
 {
-  int i;
-
-  /* marked? */
-  switch (get_kind(tore)) {
-  case k_entity:
-    if (((entity *)tore)->visit >= type_visited) return;
-    break;
-  case k_type:
-    if(type_id == get_type_tpop((type*)tore)) {
-      type_walk_2((type_or_ent *)skip_tid((type *)tore), pre, post, env);
-      return;
-    }
-    if (((type *)tore)->visit >= type_visited) return;
-    break;
-  default:
-    break;
-  }
-
-  /* execute pre method */
-  if(pre)
-    pre(tore, env);
-
-  /* iterate */
-  switch (get_kind(tore)) {
-  case k_entity:
-    {
-
-      entity *ent = (entity *)tore;
-      ent->visit = type_visited;
-      type_walk_2((type_or_ent *)get_entity_owner(ent), pre, post, env);
-      type_walk_2((type_or_ent *)get_entity_type(ent), pre, post, env);
-    }
-    break;
-  case k_type:
-    {
-      type *tp = (type *)tore;
-      mark_type_visited(tp);
-      switch (get_type_tpop_code(tp)) {
-      case tpo_class:
-       {
-         for (i=0; i<get_class_n_supertype(tp); i++)
-           type_walk_2((type_or_ent *)get_class_supertype(tp, i), pre, post, env);
-         for (i=0; i<get_class_n_member(tp); i++)
-           type_walk_2((type_or_ent *)get_class_member(tp, i), pre, post, env);
-         for (i=0; i<get_class_n_subtype(tp); i++)
-           type_walk_2((type_or_ent *)get_class_subtype(tp, i), pre, post, env);
+       switch (initializer->kind) {
+       case IR_INITIALIZER_CONST:
+               irn_type_walker(initializer->consti.value, pre, post, env);
+               return;
+       case IR_INITIALIZER_TARVAL:
+       case IR_INITIALIZER_NULL:
+               return;
+
+       case IR_INITIALIZER_COMPOUND: {
+               size_t i;
+               for (i = 0; i < initializer->compound.n_initializers; ++i) {
+                       ir_initializer_t *subinitializer
+                               = initializer->compound.initializers[i];
+                       walk_initializer(subinitializer, pre, post, env);
+               }
+               return;
        }
-       break;
-      case tpo_struct:
-       {
-         for (i=0; i<get_struct_n_member(tp); i++)
-           type_walk_2((type_or_ent *)get_struct_member(tp, i), pre, post, env);
        }
-       break;
-      case tpo_method:
-       {
-         for (i = 0; i < get_method_n_params(tp); i++)
-           type_walk_2((type_or_ent *)get_method_param_type(tp, i), pre, post, env);
-         for (i = 0; i < get_method_n_res(tp); i++)
-           type_walk_2((type_or_ent *)get_method_res_type(tp, i), pre, post, env);
+       panic("invalid initializer found");
+}
+
+/**
+ * Main walker: walks over all used types/entities of a
+ * type entity.
+ */
+static void do_type_walk(type_or_ent tore,
+                         type_walk_func *pre,
+                         type_walk_func *post,
+                         void *env)
+{
+       size_t      i, n_types, n_mem;
+       ir_entity   *ent = NULL;
+       ir_type     *tp = NULL;
+       type_or_ent cont;
+
+       /* marked? */
+       switch (get_kind(tore.ent)) {
+       case k_entity:
+               ent = tore.ent;
+               if (entity_visited(ent))
+                       return;
+               mark_entity_visited(ent);
+               break;
+       case k_type:
+               tp = tore.typ;
+               if (type_visited(tp))
+                       return;
+               mark_type_visited(tp);
+               break;
+       default:
+               break;
        }
-       break;
-      case tpo_union:
-       {
-         for (i = 0; i < get_union_n_members(tp); i++)
-           type_walk_2((type_or_ent *)get_union_member(tp, i), pre, post, env);
+
+       /* execute pre method */
+       if (pre)
+               pre(tore, env);
+
+       /* iterate */
+       switch (get_kind(tore.ent)) {
+       case k_entity:
+               cont.typ = get_entity_owner(ent);
+               do_type_walk(cont, pre, post, env);
+               cont.typ = get_entity_type(ent);
+               do_type_walk(cont, pre, post, env);
+
+               /* walk over the value types */
+               if (ent->initializer != NULL) {
+                       walk_initializer(ent->initializer, pre, post, env);
+               }
+               break;
+       case k_type:
+               switch (get_type_tpop_code(tp)) {
+               case tpo_class:
+                       n_types = get_class_n_supertypes(tp);
+                       for (i = 0; i < n_types; ++i) {
+                               cont.typ = get_class_supertype(tp, i);
+                               do_type_walk(cont, pre, post, env);
+                       }
+                       n_mem = get_class_n_members(tp);
+                       for (i = 0; i < n_mem; ++i) {
+                               cont.ent = get_class_member(tp, i);
+                               do_type_walk(cont, pre, post, env);
+                       }
+                       n_types = get_class_n_subtypes(tp);
+                       for (i = 0; i < n_types; ++i) {
+                               cont.typ = get_class_subtype(tp, i);
+                               do_type_walk(cont, pre, post, env);
+                       }
+                       break;
+
+               case tpo_struct:
+                       n_mem = get_struct_n_members(tp);
+                       for (i = 0; i < n_mem; ++i) {
+                               cont.ent = get_struct_member(tp, i);
+                               do_type_walk(cont, pre, post, env);
+                       }
+                       break;
+
+               case tpo_method:
+                       n_mem = get_method_n_params(tp);
+                       for (i = 0; i < n_mem; ++i) {
+                               cont.typ = get_method_param_type(tp, i);
+                               do_type_walk(cont, pre, post, env);
+                       }
+                       n_mem = get_method_n_ress(tp);
+                       for (i = 0; i < n_mem; ++i) {
+                               cont.typ = get_method_res_type(tp, i);
+                               do_type_walk(cont, pre, post, env);
+                       }
+                       break;
+
+               case tpo_union:
+                       n_mem = get_union_n_members(tp);
+                       for (i = 0; i < n_mem; ++i) {
+                               cont.ent = get_union_member(tp, i);
+                               do_type_walk(cont, pre, post, env);
+                       }
+                       break;
+
+               case tpo_array:
+                       cont.typ = get_array_element_type(tp);
+                       do_type_walk(cont, pre, post, env);
+                       cont.ent = get_array_element_entity(tp);
+                       do_type_walk(cont, pre, post, env);
+                       break;
+
+               case tpo_enumeration:
+                       /* a leave */
+                       break;
+
+               case tpo_pointer:
+                       cont.typ = get_pointer_points_to_type(tp);
+                       do_type_walk(cont, pre, post, env);
+                       break;
+
+               case tpo_code:
+               case tpo_primitive:
+               case tpo_none:
+               case tpo_unknown:
+                       /* a leave. */
+                       break;
+               case tpo_uninitialized:
+                       assert(0 && "Faulty type");
+                       break;
+               }
+               break; /* end case k_type */
+
+       default:
+               printf(" *** Faulty type or entity! \n");
+               break;
        }
-       break;
-      case tpo_array:
-       type_walk_2((type_or_ent *)get_array_element_type(tp),
-                   pre, post, env);
-       type_walk_2((type_or_ent *)get_array_element_entity(tp),
-                   pre, post, env);
-       break;
-      case tpo_enumeration:
-       /* a leave */
-       break;
-      case tpo_pointer:
-       type_walk_2((type_or_ent *)get_pointer_points_to_type(tp),
-                   pre, post, env);
-       break;
-      case tpo_primitive:
-      case tpo_id:
-       /* a leave. */
-       break;
-      default:
-       printf(" *** Faulty type! \n");
-       break;
-      }
-    } break; /* end case k_type */
-  default:
-    printf(" *** Faulty type or entity! \n");
-    break;
-  }
-
-  /* execute post method */
-  if(post)
-    post(tore, env);
-
-  return;
-}
 
-void start_type_walk(ir_node *node, void *env) {
-  void *pre  = ((type_walk_env *)env)->pre;
-  void *post = ((type_walk_env *)env)->post;
-  void *envi = ((type_walk_env *)env)->env;
-
-  assert(node);
-
-  switch (get_irn_opcode(node)) {  /* node label */
-  case iro_SymConst:
-    if (   (get_SymConst_kind(node) == type_tag)
-          || (get_SymConst_kind(node) == size))
-      type_walk_2((type_or_ent *)get_SymConst_type(node), pre, post, envi);
-    break;
-  case iro_Sel:
-    type_walk_2((type_or_ent *)get_Sel_entity(node), pre, post, envi);
-    break;
-  case iro_Call:
-    type_walk_2((type_or_ent *)get_Call_type(node), pre, post, envi);
-    break;
-  case iro_Alloc:
-    type_walk_2((type_or_ent *)get_Alloc_type(node), pre, post, envi);
-    break;
-  case iro_Free:
-    type_walk_2((type_or_ent *)get_Free_type(node), pre, post, envi);
-    break;
-  default:
-    break;
-  }
+       /* execute post method */
+       if (post)
+               post(tore, env);
 }
 
-void type_walk(void (pre)(type_or_ent*, void*),
-              void (post)(type_or_ent*, void*),
-              void *env) {
-  int i;
-  ++type_visited;
-  /*type_walk_2((type_or_ent *)get_glob_type(), pre, post, env);
-   global type is on the list visited below, too. */
-  for (i = 0; i < get_irp_n_types(); i++) {
-    type_walk_2((type_or_ent *)get_irp_type(i), pre, post, env);
-  }
+/**  Check whether node contains types or entities as an attribute.
+     If so start a walk over that information. */
+static void irn_type_walker(
+  ir_node *node, type_walk_func *pre, type_walk_func *post, void *env)
+{
+       type_or_ent cont;
+
+       assert(node);
+
+       cont.ent = get_irn_entity_attr(node);
+       if (cont.ent)
+               do_type_walk(cont, pre, post, env);
+       cont.typ = get_irn_type_attr(node);
+       if (cont.typ)
+               do_type_walk(cont, pre, post, env);
 }
 
-void type_walk_irg (ir_graph *irg,
-                   void (pre)(type_or_ent*, void*),
-                   void (post)(type_or_ent*, void*),
-                   void *env)
+/**  Check whether node contains types or entities as an attribute.
+     If so start a walk over that information. */
+static void start_type_walk(ir_node *node, void *ctx)
 {
-  /* this is needed to pass the parameters to the walker that actually
-     walks the type information */
-  type_walk_env* type_env;
-  type_env = (type_walk_env *) malloc (sizeof(type_walk_env));
-  type_env->pre = pre;
-  type_env->post = post;
-  type_env->env = env;
+       type_walk_env *env = (type_walk_env*)ctx;
+       type_walk_func *pre;
+       type_walk_func *post;
+       void *envi;
 
-  ++type_visited;
-  irg_walk(get_irg_end(irg), start_type_walk, NULL, type_env);
+       pre  = env->pre;
+       post = env->post;
+       envi = env->env;
 
-  type_walk_2((type_or_ent *)get_irg_ent(irg), pre, post, env);
+       irn_type_walker(node, pre, post, envi);
+}
+
+void type_walk(type_walk_func *pre, type_walk_func *post, void *env)
+{
+       size_t      i, n_types = get_irp_n_types();
+       type_or_ent cont;
+
+       irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED);
+       inc_master_type_visited();
+       for (i = 0; i < n_types; ++i) {
+               cont.typ = get_irp_type(i);
+               do_type_walk(cont, pre, post, env);
+       }
+       cont.typ = get_glob_type();
+       do_type_walk(cont, pre, post, env);
+       irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED);
+}
 
-  free(type_env);
-  return;
+void type_walk_irg(ir_graph *irg,
+                   type_walk_func *pre,
+                   type_walk_func *post,
+                   void *env)
+{
+       ir_graph *rem = current_ir_graph;
+       /* this is needed to pass the parameters to the walker that actually
+          walks the type information */
+       type_walk_env type_env;
+       type_or_ent   cont;
+
+       type_env.pre  = pre;
+       type_env.post = post;
+       type_env.env  = env;
+
+       current_ir_graph = irg;
+
+       /* We walk over the irg to find all IR-nodes that contain an attribute
+          with type information.  If we find one we call a type walker to
+          touch the reachable type information.
+          The same type can be referenced by several IR-nodes.  To avoid
+          repeated visits of the same type node we must decrease the
+          type visited flag for each walk.  This is done in start_type_walk().
+          Here we initially increase the flag.  We only call do_type_walk that does
+          not increase the flag.
+       */
+       irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED);
+       inc_master_type_visited();
+       irg_walk(get_irg_end(irg), start_type_walk, NULL, &type_env);
+
+       cont.ent = get_irg_entity(irg);
+       do_type_walk(cont, pre, post, env);
+
+       cont.typ = get_irg_frame_type(irg);
+       do_type_walk(cont, pre, post, env);
+
+       current_ir_graph = rem;
+       irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED);
 }
 
-void type_walk_s2s_2(type_or_ent *tore,
-                    void (pre)(type_or_ent*, void*),
-                    void (post)(type_or_ent*, void*),
-                    void *env)
+static void type_walk_s2s_2(type_or_ent tore,
+                            type_walk_func *pre,
+                            type_walk_func *post,
+                            void *env)
 {
-  int i;
-
-  /* marked? */
-  switch (get_kind(tore)) {
-  case k_entity:
-    if (((entity *)tore)->visit >= type_visited) return;
-    break;
-  case k_type:
-    if(type_id == get_type_tpop((type*)tore)) {
-      type_walk_s2s_2((type_or_ent *)skip_tid((type *)tore), pre, post, env);
-      return;
-    }
-    if (((type *)tore)->visit >= type_visited) return;
-    break;
-  default:
-    break;
-  }
-
-  /* iterate */
-  switch (get_kind(tore)) {
-  case k_type:
-    {
-      type *tp = (type *)tore;
-      mark_type_visited(tp);
-      switch (get_type_tpop_code(tp)) {
-      case tpo_class:
-       {
-         for (i = 0; i < get_class_n_supertype(tp); i++) {
-           type_walk_s2s_2((type_or_ent *)get_class_supertype(tp, i), pre,
-                           post, env);
-         }
-         /* execute pre method */
-         if(pre)
-           pre(tore, env);
-         tp = skip_tid((type*)tore);
-
-         for (i = 0; i < get_class_n_subtype(tp); i++) {
-           type_walk_s2s_2((type_or_ent *)get_class_subtype(tp, i), pre,
-                           post, env);
-         }
-
-         /* execute post method */
-         if(post)
-           post(tore, env);
+       type_or_ent cont;
+
+       /* marked? */
+       switch (get_kind(tore.ent)) {
+       case k_entity:
+               if (entity_visited(tore.ent)) return;
+               break;
+       case k_type:
+               if (type_visited(tore.typ)) return;
+               break;
+       default:
+               break;
+       }
+
+       /* iterate */
+       switch (get_kind(tore.typ)) {
+       case k_type:
+               {
+                       ir_type *tp = tore.typ;
+                       mark_type_visited(tp);
+                       switch (get_type_tpop_code(tp)) {
+                       case tpo_class:
+                               {
+                                       size_t i, n;
+
+                                       n = get_class_n_supertypes(tp);
+                                       for (i = 0; i < n; ++i) {
+                                               cont.typ = get_class_supertype(tp, i);
+                                               type_walk_s2s_2(cont, pre, post, env);
+                                       }
+                                       /* execute pre method */
+                                       if (pre)
+                                               pre(tore, env);
+
+                                       n = get_class_n_subtypes(tp);
+                                       for (i = 0; i < n; ++i) {
+                                               cont.typ = get_class_subtype(tp, i);
+                                               type_walk_s2s_2(cont, pre, post, env);
+                                       }
+
+                                       /* execute post method */
+                                       if (post)
+                                               post(tore, env);
+                               }
+                               break;
+                       case tpo_struct:
+                       case tpo_method:
+                       case tpo_union:
+                       case tpo_array:
+                       case tpo_enumeration:
+                       case tpo_pointer:
+                       case tpo_primitive:
+                               /* dont care */
+                               break;
+                       default:
+                               printf(" *** Faulty type! \n");
+                               break;
+                       }
+               } break; /* end case k_type */
+       case k_entity:
+               /* don't care */
+               break;
+       default:
+               printf(" *** Faulty type or entity! \n");
+               break;
        }
-       break;
-      case tpo_struct:
-      case tpo_method:
-      case tpo_union:
-      case tpo_array:
-      case tpo_enumeration:
-      case tpo_pointer:
-      case tpo_primitive:
-      case tpo_id:
-       /* dont care */
-       break;
-      default:
-       printf(" *** Faulty type! \n");
-       break;
-      }
-    } break; /* end case k_type */
-  case k_entity:
-    /* dont care */
-    break;
-  default:
-    printf(" *** Faulty type or entity! \n");
-    break;
-  }
-  return;
 }
 
-void type_walk_super2sub(void (pre)(type_or_ent*, void*),
-                        void (post)(type_or_ent*, void*),
-                        void *env) {
-  int i;
-  type *tp;
-  ++type_visited;
-  type_walk_s2s_2((type_or_ent *)get_glob_type(), pre, post, env);
-  for (i = 0; i < get_irp_n_types(); i++) {
-    tp = get_irp_type(i);
-    type_walk_s2s_2((type_or_ent *)tp, pre, post, env);
-  }
+void type_walk_super2sub(type_walk_func *pre,
+                         type_walk_func *post,
+                         void *env)
+{
+       type_or_ent cont;
+       size_t      i, n_types = get_irp_n_types();
+
+       irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED);
+       inc_master_type_visited();
+       cont.typ = get_glob_type();
+       type_walk_s2s_2(cont, pre, post, env);
+       for (i = 0; i < n_types; ++i) {
+               cont.typ = get_irp_type(i);
+               type_walk_s2s_2(cont, pre, post, env);
+       }
+       irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED);
 }
 
 /*****************************************************************************/
 
-static
-void type_walk_super_2(type_or_ent *tore,
-                      void (pre)(type_or_ent*, void*),
-                      void (post)(type_or_ent*, void*),
-                      void *env)
+static void type_walk_super_2(type_or_ent tore, type_walk_func *pre,
+                              type_walk_func *post, void *env)
 {
-  int i;
-
-  /* marked? */
-  switch (get_kind(tore)) {
-  case k_entity:
-    if (((entity *)tore)->visit >= type_visited) return;
-    break;
-  case k_type:
-    if(type_id == get_type_tpop((type*)tore)) {
-      type_walk_super_2((type_or_ent *)skip_tid((type *)tore), pre, post, env);
-      return;
-    }
-    if (((type *)tore)->visit >= type_visited) return;
-    break;
-  default:
-    break;
-  }
-
-  /* iterate */
-  switch (get_kind(tore)) {
-  case k_type:
-    {
-      type *tp = (type *)tore;
-      mark_type_visited(tp);
-      switch (get_type_tpop_code(tp)) {
-      case tpo_class:
-       {
-         /* execute pre method */
-         if(pre)
-           pre(tore, env);
-         tp = skip_tid((type*)tore);
-
-         for (i = 0; i < get_class_n_supertype(tp); i++) {
-           type_walk_super_2((type_or_ent *)get_class_supertype(tp, i), pre,
-                             post, env);
-         }
-
-         /* execute post method */
-         if(post)
-           post(tore, env);
+       type_or_ent cont;
+
+       /* marked? */
+       switch (get_kind(tore.ent)) {
+       case k_entity:
+               if (entity_visited(tore.ent))
+                       return;
+               break;
+       case k_type:
+               if (type_visited(tore.typ))
+                       return;
+               break;
+       default:
+               break;
+       }
+
+       /* iterate */
+       switch (get_kind(tore.typ)) {
+       case k_type:
+               {
+                       ir_type *tp = tore.typ;
+                       mark_type_visited(tp);
+                       switch (get_type_tpop_code(tp)) {
+                       case tpo_class:
+                               {
+                                       size_t i, n;
+
+                                       /* execute pre method */
+                                       if (pre)
+                                               pre(tore, env);
+
+                                       n = get_class_n_supertypes(tp);
+                                       for (i = 0; i < n; ++i) {
+                                               cont.typ = get_class_supertype(tp, i);
+                                               type_walk_super_2(cont, pre, post, env);
+                                       }
+
+                                       /* execute post method */
+                                       if (post)
+                                               post(tore, env);
+                               }
+                               break;
+                       case tpo_struct:
+                       case tpo_method:
+                       case tpo_union:
+                       case tpo_array:
+                       case tpo_enumeration:
+                       case tpo_pointer:
+                       case tpo_primitive:
+                               /* don't care */
+                               break;
+                       default:
+                               printf(" *** Faulty type! \n");
+                               break;
+                       }
+               } break; /* end case k_type */
+       case k_entity:
+               /* don't care */
+               break;
+       default:
+               printf(" *** Faulty type or entity! \n");
+               break;
        }
-       break;
-      case tpo_struct:
-      case tpo_method:
-      case tpo_union:
-      case tpo_array:
-      case tpo_enumeration:
-      case tpo_pointer:
-      case tpo_primitive:
-      case tpo_id:
-       /* dont care */
-       break;
-      default:
-       printf(" *** Faulty type! \n");
-       break;
-      }
-    } break; /* end case k_type */
-  case k_entity:
-    /* dont care */
-    break;
-  default:
-    printf(" *** Faulty type or entity! \n");
-    break;
-  }
-  return;
 }
 
-void type_walk_super(void (pre)(type_or_ent*, void*),
-                    void (post)(type_or_ent*, void*),
-                    void *env) {
-  int i;
-  type *tp;
-  ++type_visited;
-  type_walk_super_2((type_or_ent *)get_glob_type(), pre, post, env);
-  for (i = 0; i < get_irp_n_types(); i++) {
-    tp = get_irp_type(i);
-    type_walk_super_2((type_or_ent *)tp, pre, post, env);
-  }
+void type_walk_super(type_walk_func *pre, type_walk_func *post, void *env)
+{
+       size_t      i, n_types = get_irp_n_types();
+       type_or_ent cont;
+
+       irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED);
+       inc_master_type_visited();
+       cont.typ = get_glob_type();
+       type_walk_super_2(cont, pre, post, env);
+       for (i = 0; i < n_types; ++i) {
+               cont.typ = get_irp_type(i);
+               type_walk_super_2(cont, pre, post, env);
+       }
+       irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED);
 }
 
 /*****************************************************************************/
 
 
-void class_walk_s2s_2(type *tp,
-                    void (pre)(type*, void*),
-                    void (post)(type*, void*),
-                    void *env)
+static void class_walk_s2s_2(ir_type *tp, class_walk_func *pre,
+                             class_walk_func *post, void *env)
 {
-  int i;
+       size_t i, n;
 
-  /* marked? */
-  if (tp->visit >= type_visited) return;
+       /* marked? */
+       if (type_visited(tp)) return;
 
-  assert(is_class_type(tp));
-  /* Assure all supertypes are visited before */
-  for (i=0; i < get_class_n_supertype(tp); i++) {
-    if (get_type_visited(get_class_supertype(tp, i)) < type_visited)
-      return;
-  }
+       /* Assure all supertypes are visited before */
+       n = get_class_n_supertypes(tp);
+       for (i = 0; i < n; ++i) {
+               if (type_not_visited(get_class_supertype(tp, i)))
+                       return;
+       }
 
-  mark_type_visited(tp);
+       mark_type_visited(tp);
 
-  /* execute pre method */
-  if(pre)
-    pre(tp, env);
+       /* execute pre method */
+       if (pre)
+               pre(tp, env);
 
-  tp = skip_tid((type*)tp);
-  for (i=0; i<get_class_n_subtype(tp); i++) {
-    class_walk_s2s_2(get_class_subtype(tp, i), pre, post, env);
-  }
-  /* execute post method */
-  if(post)
-    post(tp, env);
+       n = get_class_n_subtypes(tp);
+       for (i = 0; i < n; ++i) {
+               class_walk_s2s_2(get_class_subtype(tp, i), pre, post, env);
+       }
+       /* execute post method */
+       if (post)
+               post(tp, env);
+}
 
-  return;
+void class_walk_super2sub(class_walk_func *pre,
+                          class_walk_func *post,
+                          void *env)
+{
+       size_t i, n_types = get_irp_n_types();
+       ir_type *tp;
+
+       irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED);
+       inc_master_type_visited();
+       for (i = 0; i < n_types; i++) {
+               tp = get_irp_type(i);
+               if (is_Class_type(tp) &&
+                   (get_class_n_supertypes(tp) == 0) &&
+                   type_not_visited(tp) &&
+                   (! is_frame_type(tp)) &&
+                   (tp != get_glob_type())) {
+                       class_walk_s2s_2(tp, pre, post, env);
+               }
+       }
+       irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED);
 }
 
 
-void class_walk_super2sub(void (pre)(type*, void*),
-                         void (post)(type*, void*),
-                         void *env) {
-  int i;
-  type *tp;
-
-  ++type_visited;
-  for (i = 0; i < get_irp_n_types(); i++) {
-    tp = get_irp_type(i);
-    if (is_class_type(tp) &&
-       (get_class_n_supertype(tp) == 0) &&
-       (tp->visit < type_visited) &&
-       (!is_frame_type(tp)) &&
-       (tp != get_glob_type())) {
-      class_walk_s2s_2(tp, pre, post, env);
-    }
-  }
+void walk_types_entities(ir_type *tp,
+                         entity_walk_func *doit,
+                         void *env)
+{
+       size_t i, n;
+
+       switch (get_type_tpop_code(tp)) {
+       case tpo_class:
+               n = get_class_n_members(tp);
+               for (i = 0; i < n; ++i)
+                       doit(get_class_member(tp, i), env);
+               break;
+       case tpo_struct:
+               n = get_struct_n_members(tp);
+               for (i = 0; i < n; ++i)
+                       doit(get_struct_member(tp, i), env);
+               break;
+       case tpo_union:
+               n = get_union_n_members(tp);
+               for (i = 0; i < n; ++i)
+                       doit(get_union_member(tp, i), env);
+               break;
+       case tpo_array:
+               doit(get_array_element_entity(tp), env);
+               break;
+       case tpo_method:
+       case tpo_enumeration:
+       case tpo_pointer:
+       case tpo_primitive:
+       default:
+               break;
+       }
 }