Bugfix

[libfirm] / ir / tr / typewalk.c

diff --git a/ir/tr/typewalk.c b/ir/tr/typewalk.c
index bd8e83f..193c739 100644 (file)
--- a/ir/tr/typewalk.c
+++ b/ir/tr/typewalk.c
@@ -23,14 +23,15 @@
 #include "irprog.h"
 #include "type_or_entity.h"
 #include "typegmod.h"
+#include "typewalk.h"
 
 /* Make types visible to allow most efficient access */
 #include "entity_t.h"
 #include "type_t.h"
 
 typedef struct type_walk_env {
-  void *pre;
-  void *post;
+  type_walk_func *pre;
+  type_walk_func *post;
   void *env;
 } type_walk_env;
 
@@ -142,10 +143,16 @@ static void type_walk_2(type_or_ent *tore,
   return;
 }
 
+/**  Check wether 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 *env) {
-  void *pre  = ((type_walk_env *)env)->pre;
-  void *post = ((type_walk_env *)env)->post;
-  void *envi = ((type_walk_env *)env)->env;
+ type_walk_func *pre;
+ type_walk_func *post;
+ void *envi;
+
+  pre  = ((type_walk_env *)env)->pre;
+  post = ((type_walk_env *)env)->post;
+  envi = ((type_walk_env *)env)->env;
 
   assert(node);
 
@@ -167,6 +174,9 @@ static void start_type_walk(ir_node *node, void *env) {
   case iro_Free:
     type_walk_2((type_or_ent *)get_Free_type(node), pre, post, envi);
     break;
+  case iro_Cast:
+    type_walk_2((type_or_ent *)get_Cast_type(node), pre, post, envi);
+    break;
   default:
     break;
   }
@@ -186,24 +196,38 @@ void type_walk(void (pre)(type_or_ent*, void*),
 }
 
 void type_walk_irg (ir_graph *irg,
-                   void (pre)(type_or_ent*, void*),
-                   void (post)(type_or_ent*, void*),
+                   void (*pre)(type_or_ent*, void*),
+                   void (*post)(type_or_ent*, void*),
                    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_env = (type_walk_env *) malloc (sizeof(type_walk_env));
-  type_env->pre = pre;
-  type_env->post = post;
-  type_env->env = env;
-
+  type_walk_env type_env;
+
+  type_env.pre  = pre;
+  type_env.post = post;
+  type_env.env  = env;
+
+  current_ir_graph = irg;
+
+  /* We walk over the irg to find all irnodes 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 irnodes.  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 type_walk_2 that does
+     not increase the flag.
+  */
   ++type_visited;
-  irg_walk(get_irg_end(irg), start_type_walk, NULL, type_env);
+  irg_walk(get_irg_end(irg), start_type_walk, NULL, &type_env);
 
   type_walk_2((type_or_ent *)get_irg_ent(irg), pre, post, env);
 
-  free(type_env);
+  type_walk_2((type_or_ent *)get_irg_frame_type(irg), pre, post, env);
+
+  current_ir_graph = rem;
   return;
 }