- cleanup and simplify inlining code
[libfirm] / ir / ir / irgwalk.c
index e332d29..51bf3ec 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
  * @brief   Functions for traversing ir graphs
  * @author  Boris Boesler, Goetz Lindenmaier, Michael Beck
  * @version $Id$
- * @summary
+ * @brief
  *  traverse an ir graph
  *  - execute the pre function before recursion
  *  - execute the post function after recursion
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #include "irnode_t.h"
-#include "irgraph_t.h" /* visited flag */
+#include "irgraph_t.h"
 #include "irprog.h"
 #include "irgwalk.h"
 #include "irhooks.h"
 #include "ircgcons.h"
+#include "entity_t.h"
 
+#include "error.h"
 #include "pset_new.h"
 #include "array.h"
 
+#ifdef INTERPROCEDURAL_VIEW
 /**
  * Walk over an interprocedural graph (callgraph).
  * Visits only graphs in irg_set.
  */
-static void irg_walk_cg(ir_node * node, unsigned long visited,
+static void irg_walk_cg(ir_node * node, ir_visited_t visited,
                         pset_new_t *irg_set, irg_walk_func *pre,
-                        irg_walk_func *post, void * env) {
+                        irg_walk_func *post, void * env)
+{
        int i;
        ir_graph * rem = current_ir_graph;
        ir_node * pred;
@@ -64,43 +64,44 @@ static void irg_walk_cg(ir_node * node, unsigned long visited,
        if (pre) pre(node, env);
 
        pred = skip_Proj(node);
-       if (get_irn_op(pred) == op_CallBegin
-               || get_irn_op(pred) == op_EndReg
-               || get_irn_op(pred) == op_EndExcept) {
-                       current_ir_graph = get_irn_irg(pred);
+       if (is_CallBegin(pred)            ||
+           get_irn_op(pred) == op_EndReg ||
+           get_irn_op(pred) == op_EndExcept) {
+               current_ir_graph = get_irn_irg(pred);
        }
 
        if (is_no_Block(node)) { /* not block */
                irg_walk_cg(get_nodes_block(node), visited, irg_set, pre, post, env);
        }
 
-       if (get_irn_op(node) == op_Block) { /* block */
+       if (is_Block(node)) { /* block */
                for (i = get_irn_arity(node) - 1; i >= 0; --i) {
                        ir_node * exec = get_irn_n(node, i);
                        ir_node * pred = skip_Proj(exec);
-                       if ((get_irn_op(pred) != op_CallBegin
-                               && get_irn_op(pred) != op_EndReg
-                               && get_irn_op(pred) != op_EndExcept)
-                               || pset_new_contains(irg_set, get_irn_irg(pred))) {
-                                       irg_walk_cg(exec, visited, irg_set, pre, post, env);
+                       if ((
+                             !is_CallBegin(pred)           &&
+                             get_irn_op(pred) != op_EndReg &&
+                             get_irn_op(pred) != op_EndExcept
+                           ) || pset_new_contains(irg_set, get_irn_irg(pred))) {
+                               irg_walk_cg(exec, visited, irg_set, pre, post, env);
                        }
                }
-       } else if (get_irn_op(node) == op_Filter) { /* filter */
+       } else if (is_Filter(node)) { /* filter */
                for (i = get_irn_arity(node) - 1; i >= 0; --i) {
                        ir_node * pred = get_irn_n(node, i);
-                       if (get_irn_op(pred) == op_Unknown || get_irn_op(pred) == op_Bad) {
+                       if (is_Unknown(pred) || is_Bad(pred)) {
                                irg_walk_cg(pred, visited, irg_set, pre, post, env);
                        } else {
                                ir_node * exec;
                                exec = skip_Proj(get_Block_cfgpred(get_nodes_block(node), i));
 
-                               if (op_Bad == get_irn_op (exec)) {
+                               if (is_Bad(exec)) {
                                        continue;
                                }
 
-                               assert(get_irn_op(exec) == op_CallBegin
-                                       || get_irn_op(exec) == op_EndReg
-                                       || get_irn_op(exec) == op_EndExcept);
+                               assert(is_CallBegin(exec)            ||
+                                      get_irn_op(exec) == op_EndReg ||
+                                      get_irn_op(exec) == op_EndExcept);
                                if (pset_new_contains(irg_set, get_irn_irg(exec))) {
                                        current_ir_graph = get_irn_irg(exec);
                                        irg_walk_cg(pred, visited, irg_set, pre, post, env);
@@ -119,11 +120,11 @@ static void irg_walk_cg(ir_node * node, unsigned long visited,
        current_ir_graph = rem;
 }
 
-
 /**
  * Insert all ir_graphs in irg_set, that are (transitive) reachable.
  */
-static void collect_irgs(ir_node * node, pset_new_t *irg_set) {
+static void collect_irgs(ir_node * node, pset_new_t *irg_set)
+{
        if (is_Call(node)) {
                int i;
                for (i = get_Call_n_callees(node) - 1; i >= 0; --i) {
@@ -136,17 +137,18 @@ static void collect_irgs(ir_node * node, pset_new_t *irg_set) {
                }
        }
 }
+#endif
 
 /**
  * specialized version of irg_walk_2, called if only pre callback exists
  *
  * @return number of visited nodes
  */
-static unsigned
-irg_walk_2_pre(ir_node *node, irg_walk_func *pre, void * env) {
+static unsigned irg_walk_2_pre(ir_node *node, irg_walk_func *pre, void *env)
+{
        int i;
        unsigned cnt = 1;
-       ir_graph *irg = current_ir_graph;
+       ir_graph *irg = get_irn_irg(node);
 
        set_irn_visited(node, irg->visited);
 
@@ -170,11 +172,11 @@ irg_walk_2_pre(ir_node *node, irg_walk_func *pre, void * env) {
  *
  * @return number of visited nodes
  */
-static unsigned
-irg_walk_2_post(ir_node *node, irg_walk_func *post, void * env) {
+static unsigned irg_walk_2_post(ir_node *node, irg_walk_func *post, void *env)
+{
        int i;
        unsigned cnt = 1;
-       ir_graph *irg = current_ir_graph;
+       ir_graph *irg = get_irn_irg(node);
 
        set_irn_visited(node, irg->visited);
 
@@ -199,11 +201,12 @@ irg_walk_2_post(ir_node *node, irg_walk_func *post, void * env) {
  *
  * @return number of visited nodes
  */
-static unsigned
-irg_walk_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env) {
+static unsigned irg_walk_2_both(ir_node *node, irg_walk_func *pre,
+                                irg_walk_func *post, void *env)
+{
        int i;
        unsigned cnt = 1;
-       ir_graph *irg = current_ir_graph;
+       ir_graph *irg = get_irn_irg(node);
 
        set_irn_visited(node, irg->visited);
 
@@ -230,24 +233,22 @@ irg_walk_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * e
  *
  * @return number of visited nodes
  */
-static unsigned
-irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
+unsigned irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
+                    void *env)
 {
-       if (node->visited < current_ir_graph->visited) {
-               if      (!post) return irg_walk_2_pre (node, pre, env);
-               else if (!pre)  return irg_walk_2_post(node, post, env);
-               else            return irg_walk_2_both(node, pre, post, env);
-       }
-       return 0;
+       if (irn_visited(node))
+               return 0;
+
+       if      (!post) return irg_walk_2_pre (node, pre, env);
+       else if (!pre)  return irg_walk_2_post(node, post, env);
+       else            return irg_walk_2_both(node, pre, post, env);
 }
 
 /* a counter */
 static unsigned nodes_touched = 0;
 
-/*
- * generic graph walker
- */
-void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
+void irg_walk_core(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
+                   void *env)
 {
        assert(is_ir_node(node));
 
@@ -255,7 +256,7 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
        if (get_interprocedural_view()) {
                pset_new_t           irg_set;
                pset_new_iterator_t  iter;
-               unsigned long        visited;
+               ir_visited_t         visited;
                ir_graph            *irg;
                assert(get_irp_ip_view_state() == ip_view_valid);
 
@@ -273,20 +274,27 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
                pset_new_destroy(&irg_set);
        } else {
 #endif
-               set_using_visited(current_ir_graph);
-               inc_irg_visited(current_ir_graph);
                nodes_touched = irg_walk_2(node, pre, post, env);
-               clear_using_visited(current_ir_graph);
 #ifdef INTERPROCEDURAL_VIEW
        }
 #endif
-       return;
+}
+
+void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
+              void *env)
+{
+       ir_reserve_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
+       inc_irg_visited(current_ir_graph);
+       assert(current_ir_graph == get_irn_irg(node));
+       irg_walk_core(node, pre, post, env);
+       ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
 }
 
 /*
  * walk over a graph
  */
-void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
+void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
        ir_graph * rem = current_ir_graph;
 
        hook_irg_walk(irg, (generic_func *)pre, (generic_func *)post);
@@ -299,7 +307,8 @@ void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void
 /* Executes irg_walk(end, pre, post, env) for all irgraphs in irprog.
    Sets current_ir_graph properly for each walk.  Conserves current
    current_ir_graph. */
-void all_irg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
+void all_irg_walk(irg_walk_func *pre, irg_walk_func *post, void *env)
+{
        int i, n;
        ir_graph *irg;
 
@@ -316,11 +325,11 @@ void all_irg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
  *
  * @return number of visited nodes
  */
-static unsigned
-irg_walk_in_or_dep_2_pre(ir_node *node, irg_walk_func *pre, void *env) {
+static unsigned irg_walk_in_or_dep_2_pre(ir_node *node, irg_walk_func *pre, void *env)
+{
        int i;
        unsigned cnt = 1;
-       ir_graph *irg = current_ir_graph;
+       ir_graph *irg = get_irn_irg(node);
 
        set_irn_visited(node, irg->visited);
 
@@ -344,11 +353,11 @@ irg_walk_in_or_dep_2_pre(ir_node *node, irg_walk_func *pre, void *env) {
  *
  * @return number of visited nodes
  */
-static unsigned
-irg_walk_in_or_dep_2_post(ir_node *node, irg_walk_func *post, void *env) {
+static unsigned irg_walk_in_or_dep_2_post(ir_node *node, irg_walk_func *post, void *env)
+{
        int i;
        unsigned cnt = 1;
-       ir_graph *irg = current_ir_graph;
+       ir_graph *irg = get_irn_irg(node);
 
        set_irn_visited(node, irg->visited);
 
@@ -373,11 +382,11 @@ irg_walk_in_or_dep_2_post(ir_node *node, irg_walk_func *post, void *env) {
  *
  * @return number of visited nodes
  */
-static unsigned
-irg_walk_in_or_dep_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env) {
+static unsigned irg_walk_in_or_dep_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
        int i;
        unsigned cnt = 1;
-       ir_graph *irg = current_ir_graph;
+       ir_graph *irg = get_irn_irg(node);
 
        set_irn_visited(node, irg->visited);
 
@@ -404,15 +413,14 @@ irg_walk_in_or_dep_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post
  *
  * @return number of visited nodes
  */
-static unsigned
-irg_walk_in_or_dep_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
+static unsigned irg_walk_in_or_dep_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
-       if (node->visited < current_ir_graph->visited) {
-               if      (! post) return irg_walk_in_or_dep_2_pre (node, pre, env);
-               else if (! pre)  return irg_walk_in_or_dep_2_post(node, post, env);
-               else             return irg_walk_in_or_dep_2_both(node, pre, post, env);
-       }
-       return 0;
+       if (irn_visited(node))
+               return 0;
+
+       if      (! post) return irg_walk_in_or_dep_2_pre (node, pre, env);
+       else if (! pre)  return irg_walk_in_or_dep_2_post(node, post, env);
+       else             return irg_walk_in_or_dep_2_both(node, pre, post, env);
 }
 
 /*
@@ -425,18 +433,18 @@ void irg_walk_in_or_dep(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
        if (get_interprocedural_view()) {
                assert(0 && "This is not yet implemented.");
        } else {
-               set_using_visited(current_ir_graph);
+               ir_reserve_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
                inc_irg_visited(current_ir_graph);
                nodes_touched = irg_walk_in_or_dep_2(node, pre, post, env);
-               clear_using_visited(current_ir_graph);
+               ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
        }
-       return;
 }
 
 /*
  * Walk over a graph. Follow all edges (including dependencies)
  */
-void irg_walk_in_or_dep_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
+void irg_walk_in_or_dep_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
        ir_graph * rem = current_ir_graph;
 
        hook_irg_walk(irg, (generic_func *)pre, (generic_func *)post);
@@ -452,15 +460,15 @@ void irg_walk_in_or_dep_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *
  * Returns current_ir_graph and sets it to the irg of predecessor index
  * of node n.
  */
-static INLINE ir_graph *
-switch_irg(ir_node *n, int index) {
+static inline ir_graph * switch_irg(ir_node *n, int index)
+{
        ir_graph *old_current = current_ir_graph;
 
        if (get_interprocedural_view()) {
                /* Only Filter and Block nodes can have predecessors in other graphs. */
-               if (get_irn_op(n) == op_Filter)
+               if (is_Filter(n))
                        n = get_nodes_block(n);
-               if (get_irn_op(n) == op_Block) {
+               if (is_Block(n)) {
                        ir_node *cfop = skip_Proj(get_Block_cfgpred(n, index));
                        if (is_ip_cfop(cfop)) {
                                current_ir_graph = get_irn_irg(cfop);
@@ -471,8 +479,8 @@ switch_irg(ir_node *n, int index) {
        return old_current;
 }
 
-static void
-cg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
+#ifdef INTERPROCEDURAL_VIEW
+static void cg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
 {
        int i;
        ir_graph *rem = NULL;
@@ -494,12 +502,11 @@ cg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
 
                if (post) post(node, env);
        }
-       return;
 }
 
-#ifdef INTERPROCEDURAL_VIEW
 /* Walks all irgs in interprocedural view.  Visits each node only once. */
-void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
+void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env)
+{
        int i;
        ir_graph *rem = current_ir_graph;
        int rem_view = get_interprocedural_view();
@@ -562,42 +569,42 @@ void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
 /***************************************************************************/
 
 /* Walks back from n until it finds a real cf op. */
-static ir_node *get_cf_op(ir_node *n) {
-       ir_node *pred;
-
-       n = skip_Id(n);
-       n = skip_Tuple(n);
-       pred = skip_Proj(n);
-       if (!(is_cfop(pred) || is_fragile_op(pred) || is_Bad(pred)))
-               n = get_cf_op(n);
-
-       return skip_Proj(n);
+static ir_node *get_cf_op(ir_node *n)
+{
+       while (!is_cfop(n) && !is_fragile_op(n) && !is_Bad(n)) {
+               n = skip_Id(n);
+               n = skip_Tuple(n);
+               n = skip_Proj(n);
+       }
+       return n;
 }
 
-static void irg_block_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
+static void irg_block_walk_2(ir_node *node, irg_walk_func *pre,
+                             irg_walk_func *post, void *env)
 {
        int i;
 
-       if (Block_not_block_visited(node)) {
-               mark_Block_block_visited(node);
+       if (Block_block_visited(node))
+               return;
+       mark_Block_block_visited(node);
 
-               if(pre) pre(node, env);
+       if (pre)
+               pre(node, env);
 
-               for(i = get_Block_n_cfgpreds(node) - 1; i >= 0; --i) {
-                       /* find the corresponding predecessor block. */
-                       ir_node *pred = get_cf_op(get_Block_cfgpred(node, i));
-                       pred = get_nodes_block(pred);
-                       if(get_irn_opcode(pred) == iro_Block) {
-                               /* recursion */
-                               irg_block_walk_2(pred, pre, post, env);
-                       }
-                       else {
-                               assert(get_irn_opcode(pred) == iro_Bad);
-                       }
+       for (i = get_Block_n_cfgpreds(node) - 1; i >= 0; --i) {
+               /* find the corresponding predecessor block. */
+               ir_node *pred = get_cf_op(get_Block_cfgpred(node, i));
+               pred = get_nodes_block(pred);
+               if (get_irn_opcode(pred) == iro_Block) {
+                       /* recursion */
+                       irg_block_walk_2(pred, pre, post, env);
+               } else {
+                       assert(get_irn_opcode(pred) == iro_Bad);
                }
-
-               if(post) post(node, env);
        }
+
+       if (post)
+               post(node, env);
 }
 
 
@@ -605,49 +612,48 @@ static void irg_block_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *p
    flag, so that it can be interleaved with the other walker.         */
 void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
+       ir_graph *irg = get_irn_irg(node);
        ir_node *block, *pred;
        int i;
 
-       hook_irg_block_walk(current_ir_graph, node, (generic_func *)pre, (generic_func *)post);
+       hook_irg_block_walk(irg, node, (generic_func *)pre, (generic_func *)post);
 
        assert(node);
        assert(!get_interprocedural_view());   /* interprocedural_view not implemented, because it
-                                              * interleaves with irg_walk */
-       set_using_block_visited(current_ir_graph);
-       inc_irg_block_visited(current_ir_graph);
+                                               * interleaves with irg_walk */
+       ir_reserve_resources(irg, IR_RESOURCE_BLOCK_VISITED);
+       inc_irg_block_visited(irg);
        block = is_Block(node) ? node : get_nodes_block(node);
-       assert(get_irn_op(block) == op_Block);
+       assert(is_Block(block));
        irg_block_walk_2(block, pre, post, env);
 
        /* keepalive: the endless loops ... */
-       if (get_irn_op(node) == op_End) {
+       if (is_End(node)) {
                int arity = get_irn_arity(node);
                for (i = 0; i < arity; i++) {
                        pred = get_irn_n(node, i);
-                       if (get_irn_op(pred) == op_Block)
-                               irg_block_walk_2(pred, pre, post, env);
-               }
-               /* Sometimes the blocks died, but are still reachable through Phis.
-               * Make sure the algorithms that try to remove these reach them. */
-               for (i = 0; i < arity; i++) {
-                       pred = get_irn_n(node, i);
-                       if (get_irn_op(pred) == op_Phi) {
-                               ir_node *block = get_nodes_block(pred);
-
-                               if (! is_Bad(block))
-                                       irg_block_walk_2(block, pre, post, env);
+                       if (!is_Block(pred)) {
+                               pred = get_nodes_block(pred);
+                               if (!is_Block(pred)) {
+                                       /* if rare cases a kept node might have a bad block input */
+                                       continue;
+                               }
                        }
+                       /* Sometimes the blocks died, but are still reachable through kept nodes.
+                        * Make sure the algorithms that try to remove these reach them. */
+                       irg_block_walk_2(pred, pre, post, env);
                }
        }
 
-       clear_using_block_visited(current_ir_graph);
+       ir_free_resources(irg, IR_RESOURCE_BLOCK_VISITED);
 }
 
 /*
  * walk over a graph block wise
  */
 void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre,
-              irg_walk_func *post, void *env) {
+                          irg_walk_func *post, void *env)
+{
        ir_graph * rem = current_ir_graph;
        current_ir_graph = irg;
        irg_block_walk(get_irg_end(irg), pre, post, env);
@@ -657,7 +663,8 @@ void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre,
 /*
  * Additionally walk over all anchors. Do NOT increase the visit flag.
  */
-void irg_walk_anchors(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
+void irg_walk_anchors(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
        ir_graph * rem = current_ir_graph;
        current_ir_graph = irg;
 
@@ -675,6 +682,29 @@ typedef struct walk_env {
        void *env;
 } walk_env;
 
+static void walk_initializer(ir_initializer_t *initializer, walk_env *env)
+{
+       switch (initializer->kind) {
+    case IR_INITIALIZER_CONST:
+       irg_walk(initializer->consti.value, env->pre, env->post, env->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, env);
+        }
+        return;
+    }
+       }
+       panic("invalid initializer found");
+}
+
 /**
  * Walk to all constant expressions in this entity.
  */
@@ -682,22 +712,22 @@ static void walk_entity(ir_entity *ent, void *env)
 {
        walk_env *my_env = (walk_env *)env;
 
-       if (get_entity_variability(ent) != variability_uninitialized) {
-               if (is_atomic_entity(ent)) {
-                       irg_walk(get_atomic_ent_value(ent), my_env->pre, my_env->post, my_env->env);
-               } else {
-                       int i, n_vals = get_compound_ent_n_values(ent);
+       if (ent->initializer != NULL) {
+               walk_initializer(ent->initializer, my_env);
+       } else if (entity_has_compound_ent_values(ent)) {
+               int i, n_vals = get_compound_ent_n_values(ent);
 
-                       for (i = 0; i < n_vals; i++)
-                               irg_walk(get_compound_ent_value(ent, i), my_env->pre, my_env->post, my_env->env);
-               }
+               for (i = 0; i < n_vals; i++)
+                       irg_walk(get_compound_ent_value(ent, i), my_env->pre, my_env->post, my_env->env);
        }
 }
 
 /* Walks over all code in const_code_irg. */
-void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env) {
+void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env)
+{
        int i, j, n_types;
        walk_env my_env;
+       ir_segment_t s;
 
        ir_graph *rem = current_ir_graph;
        current_ir_graph = get_const_code_irg();
@@ -708,7 +738,8 @@ void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env) {
        my_env.env = env;
 
        /* Walk all types that can contain constant entities.  */
-       walk_types_entities(get_glob_type(), &walk_entity, &my_env);
+       for (s = IR_SEGMENT_FIRST; s <= IR_SEGMENT_LAST; s++)
+               walk_types_entities(get_segment_type(s), &walk_entity, &my_env);
        n_types = get_irp_n_types();
        for (i = 0; i < n_types; i++)
                walk_types_entities(get_irp_type(i), &walk_entity, &my_env);