- add support for statistics and merge debug info

[libfirm] / ir / ana / irextbb2.c

diff --git a/ir/ana/irextbb2.c b/ir/ana/irextbb2.c
index 3c007af..3c934c2 100644 (file)
--- a/ir/ana/irextbb2.c
+++ b/ir/ana/irextbb2.c
@@ -1,5 +1,5 @@
 /*
- * Copyrigth (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.
  *
@@ -27,9 +27,7 @@
  *  Alternative algorithm for computing extended basic blocks (using out edges
  *  and execution frequencies)
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "irextbb_t.h"
 #include "irgwalk.h"
@@ -109,11 +107,10 @@ static void create_extblk(ir_node *block, env_t *env)
 {
        ir_extblk *extblk;
 
-       if (irn_visited(block))
+       if (irn_visited_else_mark(block))
                return;
 
        extblk = allocate_extblk(block, env);
-       mark_irn_visited(block);
 
        pick_successor(block, extblk, env);
 }
@@ -191,7 +188,7 @@ void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) {
                obstack_free(irg->extbb_obst, NULL);
        }
        else {
-               irg->extbb_obst = xmalloc(sizeof(*irg->extbb_obst));
+               irg->extbb_obst = XMALLOC(struct obstack);
        }
        obstack_init(irg->extbb_obst);
 
@@ -207,9 +204,7 @@ void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) {
 
        /* the end block needs a extbb assigned (even for endless loops) */
        endblock = get_irg_end_block(irg);
-       if (! irn_visited(endblock)) {
-               create_extblk(endblock, &env);
-       }
+       create_extblk(endblock, &env);
 
        /*
                Ok, we have now the list of all extended blocks starting with env.head