- removed permanent debug output

[libfirm] / ir / ana / cgana.c

diff --git a/ir/ana/cgana.c b/ir/ana/cgana.c
index 722f6f3..3d42da8 100644 (file)
--- a/ir/ana/cgana.c
+++ b/ir/ana/cgana.c
@@ -31,13 +31,9 @@
  *  methods that are 'free', i.e., their adress is handled by
  *  the program directly, or they are visible external.
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
-#ifdef HAVE_STRING_H
 # include <string.h>
-#endif
 
 #include "cgana.h"
 #include "rta.h"
@@ -63,10 +59,6 @@
 
 #include "irdump.h"
 
-#include "irhooks.h"
-
-
-
 /* unambiguous address used as a mark. */
 static void *MARK = &MARK;
 
@@ -348,7 +340,7 @@ static void free_mark_proj(ir_node * node, long n, eset * set) {
                 * op_Tuple oder ein Knoten, der in "free_ana_walker" behandelt
                 * wird. */
                ir_node * pred = get_Proj_pred(node);
-               if (get_irn_link(pred) != MARK && get_irn_op(pred) == op_Tuple) {
+               if (get_irn_link(pred) != MARK && is_Tuple(pred)) {
                        free_mark_proj(get_Tuple_pred(pred, get_Proj_proj(node)), n, set);
                } else {
                        /* nothing: da in "free_ana_walker" behandelt. */
@@ -413,9 +405,6 @@ static void free_mark(ir_node *node, eset * set) {
                        if (is_method_entity(ent)) {
                                eset_insert(set, ent);
                        }
-               } else {
-                       assert(get_SymConst_kind(node) == symconst_addr_name);
-                       /* nothing: SymConst points to extern method */
                }
                break;
 
@@ -606,11 +595,11 @@ static ir_entity **get_free_methods(int *length)
                        eset_insert(free_set, ent);
                }
 
-               set_using_irn_link(irg);
+               ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
                /* Find all method entities that gets "visible" through this graphs,
                 * for instance because their address is stored. */
                irg_walk_graph(irg, firm_clear_link, free_ana_walker, free_set);
-               clear_using_irn_link(irg);
+               ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
        }
 
        /* insert all methods that are used in global variables initializers */
@@ -632,7 +621,7 @@ static ir_entity **get_free_methods(int *length)
 
        /* Finally, transform the set into an array. */
        *length = eset_count(free_set);
-       arr = xmalloc(sizeof(ir_entity *) * (*length));
+       arr = XMALLOCN(ir_entity*, *length);
        for (i = 0, ent = eset_first(free_set); ent; ent = eset_next(free_set)) {
                arr[i++] = ent;
        }
@@ -742,13 +731,6 @@ static void callee_ana_node(ir_node *node, eset *methods) {
                callee_ana_node(get_Mux_true(node), methods);
                break;
 
-       case iro_Psi:
-               for (i = get_Psi_n_conds(node) - 1; i >= 0; --i) {
-                       callee_ana_node(get_Psi_val(node, i), methods);
-               }
-               callee_ana_node(get_Psi_default(node), methods);
-               break;
-
        case iro_Id:
                callee_ana_node(get_Id_pred(node), methods);
                break;