Remove unused variables, squelch warning about unused parameter.
[libfirm] / ir / opt / tropt.c
index f1fb97b..7e2ac66 100644 (file)
-/**
- * @file tropt.c
+/*
+ * 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.
  *
- * Project:     libFIRM
- * File name:   ir/opt/tropt.c
- * Purpose:     Optimize the type representation.
- * Author:      Goetz Lindenmaier
- * Modified by:
- * Created:     20.4.2005
- * CVS-ID:      $Id$
- * Copyright:   (c) 2005 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
  *
- * Perform optimizations of the type representation.
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
-#include <alloca.h>
+/**
+ * @file
+ * @brief   Perform optimizations of the type representation.
+ * @date    20.4.2005
+ * @author  Goetz Lindenmaier
+ * @version $Id$
+ */
+#include "config.h"
 
-#include "tropt.h"
+#include <assert.h>
 
+#include "iroptimize.h"
 #include "irprog.h"
-#include "mangle.h"
-
-#include "tr_inheritance.h"
 #include "irtypeinfo.h"
 #include "irgwalk.h"
-#include "irsimpletype.h"
 #include "trouts.h"
 #include "ircons.h"
 #include "irgmod.h"
-#include "irflag.h"
+#include "irflag_t.h"
+#include "xmalloc.h"
+#include "debug.h"
+#include "opt_init.h"
+
+DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 
 /* - statistics ---------------------------------------------- */
 
-static int n_casts_normalized = 0;
-static int n_casts_removed    = 0;
-static int n_sels_concretized = 0;
+static size_t n_casts_normalized = 0;
+static size_t n_casts_removed    = 0;
+static size_t n_sels_concretized = 0;
 
 /* - Cast normalization. ------------------------------------- */
 
-static type *default_gen_pointer_type_to(type *tp);
+static ir_type *default_gen_pointer_type_to(ir_type *tp);
 
 #define PTR_TYPE_SUFFIX "cc_ptr_tp"  /* class cast pointer type. */
 static ident *ptr_type_suffix = NULL;
 static gen_pointer_type_to_func gen_pointer_type_to = default_gen_pointer_type_to;
 
-static type *default_gen_pointer_type_to(type *tp) {
-  type *res = NULL;
-  if (get_trouts_state() == outs_consistent) {
-    if (get_type_n_pointertypes_to(tp) > 0) {
-      res = get_type_pointertype_to(tp, 0);
-    } else {
-      ir_mode *mode = mode_P_data;
-
-      if (is_Method_type(tp))
-        mode = mode_P_code;
-      res = new_type_pointer_mode(mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode);
-      /* Update trout for pointertypes, so we can use it in next call. */
-      add_type_pointertype_to(tp, res);
-    }
-  } else {
-    res = find_pointer_type_to_type(tp);
-    if (res == firm_unknown_type)
-      res = new_type_pointer_mode(mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode_P_data);
-  }
-
-  return res;
+/**
+ * Find a pointer type to a given type.
+ * Uses and updates trouts if available.
+ */
+static ir_type *default_gen_pointer_type_to(ir_type *tp)
+{
+       ir_type *res = NULL;
+       if (get_trouts_state() == outs_consistent) {
+               if (get_type_n_pointertypes_to(tp) > 0) {
+                       res = get_type_pointertype_to(tp, 0);
+               } else {
+                       res = new_type_pointer(tp);
+                       /* Update trout for pointer types, so we can use it in next call. */
+                       add_type_pointertype_to(tp, res);
+               }
+       } else {
+               res = find_pointer_type_to_type(tp);
+               if (res == firm_unknown_type)
+                       res = new_type_pointer(tp);
+       }
+
+       return res;
 }
 
-/* Return a type that is a depth times pointer to type. */
-static type *pointerize_type(type *tp, int depth) {
-  for (; depth > 0; --depth) {
-    tp = gen_pointer_type_to(tp);
-  }
-  return tp;
+/** Return a type that is a depth times pointer to type. */
+static ir_type *pointerize_type(ir_type *tp, size_t depth)
+{
+       for (; depth > 0; --depth) {
+               tp = gen_pointer_type_to(tp);
+       }
+       return tp;
 }
 
 
-static ir_node *normalize_values_type(type *totype, ir_node *pred) {
-  type *fromtype = get_irn_typeinfo_type(pred);
-  ir_node *new_cast = pred;
-  int ref_depth = 0;
-
-  if (totype == fromtype) return pred;   /* Case for optimization! */
-
-  while (is_Pointer_type(totype) && is_Pointer_type(fromtype)) {
-    totype   = get_pointer_points_to_type(totype);
-    fromtype = get_pointer_points_to_type(fromtype);
-    ref_depth++;
-  }
-
-  if (!is_Class_type(totype))   return pred;
-  if (!is_Class_type(fromtype)) return pred;
-
-  if ((get_class_supertype_index(totype, fromtype) != -1) ||
-      (get_class_supertype_index(fromtype, totype) != -1) ) {
-    /* It's just what we want ... */
-    return pred;
-  }
-
-  set_cur_block(get_nodes_block(pred));
-
-  if (is_subclass_of(totype, fromtype)) {
-    /* downcast */
-    while (get_class_subtype_index(fromtype, totype) == -1) {
-      /* Insert a cast to a subtype of fromtype. */
-      type *new_type = NULL;
-      ir_node *new_cast;
-      int i, n_subtypes = get_class_n_subtypes(fromtype);
-      for (i = 0; i < n_subtypes && !new_type; ++i) {
-       type *new_sub = get_class_subtype(fromtype, i);
-       if (is_superclass_of(new_sub, totype))
-         new_type = new_sub;
-      }
-      assert(new_type);
-      fromtype = new_type;
-      new_type = pointerize_type(new_type, ref_depth);
-      new_cast = new_Cast(pred, new_type);
-      pred = new_cast;
-      n_casts_normalized ++;
-      set_irn_typeinfo_type(new_cast, new_type);  /* keep type information up to date. */
-      if (get_trouts_state() != outs_none) add_type_cast(new_type, new_cast);
-    }
-  }
-  else {
-    assert(is_superclass_of(totype, fromtype));
-    /* upcast */
-    while (get_class_supertype_index(fromtype, totype) == -1) {
-      /* Insert a cast to a supertype of fromtype. */
-      type *new_type = NULL;
-      int i, n_supertypes = get_class_n_supertypes(fromtype);
-      for (i = 0; i < n_supertypes && !new_type; ++i) {
-       type *new_super = get_class_supertype(fromtype, i);
-       if (is_subclass_of(new_super, totype))
-         new_type = new_super;
-      }
-      assert(new_type);
-      fromtype = new_type;
-      new_type = pointerize_type(new_type, ref_depth);
-      new_cast = new_Cast(pred, new_type);
-      pred = new_cast;
-      n_casts_normalized ++;
-      set_irn_typeinfo_type(new_cast, new_type);  /* keep type information up to date. */
-      if (get_trouts_state() != outs_none) add_type_cast(new_type, new_cast);
-    }
-  }
-  return new_cast;
+static ir_node *normalize_values_type(ir_type *totype, ir_node *pred)
+{
+       ir_type *fromtype = get_irn_typeinfo_type(pred);
+       ir_node *new_cast = pred;
+       ir_node *block;
+       size_t  ref_depth = 0;
+
+       if (totype == fromtype) return pred;   /* Case for optimization! */
+
+       while (is_Pointer_type(totype) && is_Pointer_type(fromtype)) {
+               totype   = get_pointer_points_to_type(totype);
+               fromtype = get_pointer_points_to_type(fromtype);
+               ++ref_depth;
+       }
+
+       if (!is_Class_type(totype))   return pred;
+       if (!is_Class_type(fromtype)) return pred;
+
+       if ((get_class_supertype_index(totype, fromtype) != (size_t)-1) ||
+               (get_class_supertype_index(fromtype, totype) != (size_t)-1) ) {
+                       /* It's just what we want ... */
+                       return pred;
+       }
+
+       block = get_nodes_block(pred);
+
+       if (is_SubClass_of(totype, fromtype)) {
+               /* downcast */
+               while (get_class_subtype_index(fromtype, totype) == (size_t)-1) {
+                       /* Insert a cast to a subtype of fromtype. */
+                       ir_type *new_type = NULL;
+                       ir_node *new_cast;
+                       size_t   i;
+                       size_t   n_subtypes = get_class_n_subtypes(fromtype);
+                       for (i = 0; i < n_subtypes && !new_type; ++i) {
+                               ir_type *new_sub = get_class_subtype(fromtype, i);
+                               if (is_SuperClass_of(new_sub, totype))
+                                       new_type = new_sub;
+                       }
+                       assert(new_type);
+                       fromtype = new_type;
+                       new_type = pointerize_type(new_type, ref_depth);
+                       new_cast = new_r_Cast(block, pred, new_type);
+                       pred = new_cast;
+                       ++n_casts_normalized;
+                       set_irn_typeinfo_type(new_cast, new_type);  /* keep type information up to date. */
+                       if (get_trouts_state() != outs_none) add_type_cast(new_type, new_cast);
+               }
+       } else {
+               assert(is_SuperClass_of(totype, fromtype));
+               /* upcast */
+               while (get_class_supertype_index(fromtype, totype) == (size_t)-1) {
+                       /* Insert a cast to a supertype of fromtype. */
+                       ir_type *new_type = NULL;
+                       size_t i, n_supertypes = get_class_n_supertypes(fromtype);
+                       for (i = 0; i < n_supertypes && !new_type; ++i) {
+                               ir_type *new_super = get_class_supertype(fromtype, i);
+                               if (is_SubClass_of(new_super, totype))
+                                       new_type = new_super;
+                       }
+                       assert(new_type);
+                       fromtype = new_type;
+                       new_type = pointerize_type(new_type, ref_depth);
+                       new_cast = new_r_Cast(block, pred, new_type);
+                       pred = new_cast;
+                       ++n_casts_normalized;
+                       set_irn_typeinfo_type(new_cast, new_type);  /* keep type information up to date. */
+                       if (get_trouts_state() != outs_none) add_type_cast(new_type, new_cast);
+               }
+       }
+       return new_cast;
 }
 
-
-static void normalize_irn_class_cast(ir_node *n, void *env) {
-  ir_node *res;
-  if (get_irn_op(n) == op_Cast) {
-    ir_node *pred  = get_Cast_op(n);
-    type *totype   = get_Cast_type(n);
-    res = normalize_values_type(totype, pred);
-    set_Cast_op(n, res);
-  } else if (get_irn_op(n) == op_Call) {
-    int i, n_params = get_Call_n_params(n);
-    type *tp = get_Call_type(n);
-    for (i = 0; i < n_params; ++i) {
-      res = normalize_values_type(get_method_param_type(tp, i), get_Call_param(n, i));
-      set_Call_param(n, i, res);
-    }
-  }
+/**
+ * Post-Walker.
+ */
+static void normalize_irn_class_cast(ir_node *n, void *env)
+{
+       ir_node *res;
+       (void) env;
+       if (is_Cast(n)) {
+               ir_node *pred   = get_Cast_op(n);
+               ir_type *totype = get_Cast_type(n);
+               res = normalize_values_type(totype, pred);
+               set_Cast_op(n, res);
+       } else if (is_Call(n)) {
+               size_t n_params = get_Call_n_params(n);
+               size_t i;
+               ir_type *tp = get_Call_type(n);
+               for (i = 0; i < n_params; ++i) {
+                       res = normalize_values_type(get_method_param_type(tp, i), get_Call_param(n, i));
+                       set_Call_param(n, i, res);
+               }
+       }
 }
 
 
-static void pure_normalize_irg_class_casts(ir_graph *irg) {
-  assert(get_irg_class_cast_state(irg) != ir_class_casts_any &&
-        "Cannot normalize irregular casts.");
-  if (get_irg_class_cast_state(irg) == ir_class_casts_normalized) {
-    verify_irg_class_cast_state(irg);
-    return;
-  }
+static void pure_normalize_irg_class_casts(ir_graph *irg)
+{
+       assert(get_irg_class_cast_state(irg) != ir_class_casts_any &&
+               "Cannot normalize irregular casts.");
+       if (get_irg_class_cast_state(irg) == ir_class_casts_normalized) {
+               verify_irg_class_cast_state(irg);
+               return;
+       }
 
-  irg_walk_graph(irg, NULL, normalize_irn_class_cast, NULL);
-  set_irg_class_cast_state(irg, ir_class_casts_normalized);
+       irg_walk_graph(irg, NULL, normalize_irn_class_cast, NULL);
+       set_irg_class_cast_state(irg, ir_class_casts_normalized);
 }
 
 
-void normalize_irg_class_casts(ir_graph *irg, gen_pointer_type_to_func gppt_fct) {
-  assert(get_irp_typeinfo_state() == ir_typeinfo_consistent);
+void normalize_irg_class_casts(ir_graph *irg, gen_pointer_type_to_func gppt_fct)
+{
+       assert(get_irp_typeinfo_state() == ir_typeinfo_consistent);
 
-  if (gppt_fct) gen_pointer_type_to = gppt_fct;
+       if (gppt_fct) gen_pointer_type_to = gppt_fct;
 
-  if (!ptr_type_suffix)
-    ptr_type_suffix = new_id_from_str(PTR_TYPE_SUFFIX);
+       if (!ptr_type_suffix)
+               ptr_type_suffix = new_id_from_str(PTR_TYPE_SUFFIX);
 
-  pure_normalize_irg_class_casts(irg);
+       pure_normalize_irg_class_casts(irg);
 
-  gen_pointer_type_to = default_gen_pointer_type_to;
+       gen_pointer_type_to = default_gen_pointer_type_to;
 }
 
-void normalize_irp_class_casts(gen_pointer_type_to_func gppt_fct) {
-  int i, n_irgs = get_irp_n_irgs();
-  if (gppt_fct) gen_pointer_type_to = gppt_fct;
+void normalize_irp_class_casts(gen_pointer_type_to_func gppt_fct)
+{
+       size_t i, n;
+       if (gppt_fct) gen_pointer_type_to = gppt_fct;
 
-  if (get_irp_typeinfo_state() != ir_typeinfo_consistent)
-    simple_analyse_types();
+#if 0
+       if (get_irp_typeinfo_state() != ir_typeinfo_consistent)
+               simple_analyse_types();
+#endif
 
-  for (i = 0; i < n_irgs; ++i) {
-    pure_normalize_irg_class_casts(get_irp_irg(i));
-  }
+       for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
+               ir_graph *irg = get_irp_irg(i);
+               pure_normalize_irg_class_casts(irg);
+       }
 
-  set_irp_class_cast_state(ir_class_casts_normalized);
-  gen_pointer_type_to = default_gen_pointer_type_to;
+       set_irp_class_cast_state(ir_class_casts_normalized);
+       gen_pointer_type_to = default_gen_pointer_type_to;
 
-  if (get_opt_optimize_class_casts_verbose() && get_firm_verbosity()) {
-    printf(" Cast normalization: %d Casts inserted.\n", n_casts_normalized);
-  }
+       DB((dbg, SET_LEVEL_1, " Cast normalization: %zu Casts inserted.\n", n_casts_normalized));
 }
 
 
 
 /* - Cast optimization. ------------------------------------------- */
 
-static void cancel_out_casts(ir_node *cast) {
-  ir_node *orig, *pred = get_Cast_op(cast);
-  type *tp_cast, *tp_pred, *tp_orig;
-  int ref_depth = 0;
-
-  if (get_irn_op(pred) != op_Cast) return;
-  orig = get_Cast_op(pred);
-
-  tp_cast = get_Cast_type(cast);
-  tp_pred = get_Cast_type(pred);
-  tp_orig = get_irn_typeinfo_type(orig);
-
-  while (is_Pointer_type(tp_cast) &&
-        is_Pointer_type(tp_pred) &&
-        is_Pointer_type(tp_orig)   ) {
-    tp_cast = get_pointer_points_to_type(tp_cast);
-    tp_pred = get_pointer_points_to_type(tp_pred);
-    tp_orig = get_pointer_points_to_type(tp_orig);
-    ref_depth++;
-  }
-
-  if (!is_Class_type(tp_cast)) return;
-  if (!is_Class_type(tp_pred)) return;
-  if (!is_Class_type(tp_orig)) return;
-
-  if (is_subclass_of(tp_pred, tp_cast) && get_opt_suppress_downcast_optimization())
-    return;
-
-  if (tp_cast == tp_orig) {
-    exchange(cast, orig);
-    n_casts_removed += 2;
-    return;
-  }
-
-  if (!(is_subclass_of  (tp_cast, tp_orig) || is_subclass_of  (tp_orig, tp_cast)))
-    /* Avoid (B2)(A)(new B1()) --> (B2)(new B1()) */
-    return;
-
-  if ((is_subclass_of  (tp_cast, tp_pred) && is_superclass_of(tp_pred, tp_orig)) ||
-      (is_superclass_of(tp_cast, tp_pred) && is_subclass_of  (tp_pred, tp_orig))   ) {
-    set_Cast_op (cast, orig);
-    n_casts_removed ++;
-  }
+/**
+ * Optimizes Casts:
+ *
+ *  (T1)(T2)x<T1> -> x<T1>
+ *
+ *  (T3)(T2)x<T1> -> (T3)x<T1>
+ *
+ * if possible.
+ *
+ * @param cast  the Cast node
+ *
+ * @return 1 if the cast was changed
+ */
+static int cancel_out_casts(ir_node *cast)
+{
+       ir_node *orig, *pred = get_Cast_op(cast);
+       ir_type *tp_cast, *tp_pred, *tp_orig;
+
+       if (!is_Cast(pred)) return 0;
+       orig = get_Cast_op(pred);
+
+       tp_cast = get_Cast_type(cast);
+       tp_pred = get_Cast_type(pred);
+       tp_orig = get_irn_typeinfo_type(orig);
+
+       while (is_Pointer_type(tp_cast) &&
+             is_Pointer_type(tp_pred) &&
+             is_Pointer_type(tp_orig)   ) {
+               tp_cast = get_pointer_points_to_type(tp_cast);
+               tp_pred = get_pointer_points_to_type(tp_pred);
+               tp_orig = get_pointer_points_to_type(tp_orig);
+       }
+
+       if (!is_Class_type(tp_cast) || !is_Class_type(tp_pred) || !is_Class_type(tp_orig))
+               return 0;
+
+       if (is_SubClass_of(tp_pred, tp_cast) && get_opt_suppress_downcast_optimization())
+               return 0;
+
+       if (tp_cast == tp_orig) {
+               exchange(cast, orig);
+               n_casts_removed += 2;
+               return 1;
+       }
+
+       if (!(is_SubClass_of  (tp_cast, tp_orig) || is_SubClass_of  (tp_orig, tp_cast))) {
+               /* Avoid (B2)(A)(new B1()) --> (B2)(new B1())
+               * if B1 =!> B2  and  B2 =!> B1
+               */
+               return 0;
+       }
+
+       if ((is_SubClass_of  (tp_cast, tp_pred) && is_SuperClass_of(tp_pred, tp_orig)) ||
+           (is_SuperClass_of(tp_cast, tp_pred) && is_SubClass_of  (tp_pred, tp_orig))) {
+               /* Cast --> Pred --> Orig */
+               set_Cast_op(cast, orig);
+               ++n_casts_removed;
+               return 1;
+       }
+       return 0;
 }
 
-static void concretize_selected_entity(ir_node *sel) {
-  ir_node *cast, *ptr = get_Sel_ptr(sel);
-  type *orig_tp, *cast_tp;
-  entity *new_ent, *sel_ent;
-
-  sel_ent = get_Sel_entity(sel);
-  cast = get_Sel_ptr(sel);
-
-  while (get_irn_op(cast) == op_Cast) {
-    cast_tp = get_Cast_type(cast);
-    ptr = get_Cast_op(cast);
-    orig_tp = get_irn_typeinfo_type(ptr);
-
-    if (!is_Pointer_type(orig_tp)) return;
-    if (!is_Pointer_type(cast_tp)) return;
-    orig_tp = get_pointer_points_to_type(orig_tp);
-    cast_tp = get_pointer_points_to_type(cast_tp);
-    if (!is_Class_type(orig_tp)) return;
-    if (!is_Class_type(cast_tp)) return;
-
-    /* We only want to contretize, but not generalize. */
-    if (!is_superclass_of(cast_tp, orig_tp)) return;
-
-    /* Hmm, we are not properly typed. */
-    if (get_class_member_index(cast_tp, sel_ent) == -1) return;
-
-    new_ent = resolve_ent_polymorphy(orig_tp, sel_ent);
-
-    /* New ent must be member of orig_tp. */
-    if (get_class_member_index(orig_tp, new_ent) == -1) return;
-
-    set_Sel_entity(sel, new_ent);
-    set_Sel_ptr(sel, ptr);
-    n_sels_concretized++;
-
-    sel_ent = new_ent;
-    cast = ptr;
-  }
+/**
+ * Optimize Sel(Cast(type, ptr), ent) into Sel(ptr_type, ent_type)
+ *
+ * @param sel  the Sel node
+ *
+ * @return 1 if Cast's where removed
+ */
+static int concretize_selected_entity(ir_node *sel)
+{
+       ir_node   *cast, *ptr = get_Sel_ptr(sel);
+       ir_type   *orig_tp, *cast_tp;
+       ir_entity *new_ent, *sel_ent;
+       int       res = 0;
+
+       sel_ent = get_Sel_entity(sel);
+       cast    = get_Sel_ptr(sel);
+
+       while (is_Cast(cast)) {
+               cast_tp = get_Cast_type(cast);
+               ptr     = get_Cast_op(cast);
+               orig_tp = get_irn_typeinfo_type(ptr);
+
+               /* we handle only classes */
+               if (!is_Pointer_type(orig_tp)|| !is_Pointer_type(cast_tp))
+                       return res;
+               orig_tp = get_pointer_points_to_type(orig_tp);
+               cast_tp = get_pointer_points_to_type(cast_tp);
+               if (!is_Class_type(orig_tp) || !is_Class_type(cast_tp))
+                       return res;
+
+               /* We only want to concretize, but not generalize. */
+               if (!is_SuperClass_of(cast_tp, orig_tp))
+                       return res;
+
+               /* The sel entity should be a member of the cast_tp, else
+                  the graph was not properly typed. */
+               if (get_class_member_index(cast_tp, sel_ent) == (size_t)-1)
+                       return res;
+
+               new_ent = resolve_ent_polymorphy(orig_tp, sel_ent);
+
+               /* New ent must be member of orig_tp. */
+               if (get_class_member_index(orig_tp, new_ent) == (size_t)-1)
+                       return res;
+
+               /* all checks done, we can remove the Cast and update the Sel */
+               set_Sel_entity(sel, new_ent);
+               set_Sel_ptr(sel, ptr);
+               ++n_sels_concretized;
+
+               sel_ent = new_ent;
+               cast    = ptr;
+               res     = 1;
+       }
+       return res;
 }
 
-static void concretize_Phi_type(ir_node *phi) {
-  int i, n_preds = get_Phi_n_preds(phi);
-  ir_node **pred = alloca(n_preds * sizeof(ir_node *));
-  ir_node *new;
-  type *totype, *fromtype;
-
-  if (n_preds == 0) return;
-  pred[0] = get_Phi_pred(phi, 0);
-
-  if (get_irn_op(pred[0]) != op_Cast) return;
-
-  if (!is_Cast_upcast(pred[0])) return;
-
-  fromtype = get_irn_typeinfo_type(get_Cast_op(pred[0]));
-  totype   = get_Cast_type(pred[0]);
-
-  pred[0] = get_Cast_op(pred[0]);
-  for (i = 1; i < n_preds; ++i) {
-    pred[i] = get_Phi_pred(phi, i);
-    if (get_irn_op(pred[i]) != op_Cast) return;
-    if (get_irn_typeinfo_type(get_Cast_op(pred[i])) != fromtype) return;
-    pred[i] = get_Cast_op(pred[i]);
-  }
-
-  /* Transform Phi */
-  set_cur_block(get_nodes_block(phi));
-  new = new_Phi(n_preds, pred, get_irn_mode(phi));
-  set_irn_typeinfo_type(new, fromtype);
-  new = new_Cast(new, totype);
-  set_irn_typeinfo_type(new, totype);
-  exchange(phi, new);
+/**
+ * Move Casts of the same type through a Phi node, i.e.
+ * Phi(Cast(type, x_0), ..., Cast(type, x_n)) -> Cast(type, Phi(x_0, ..., x_n))
+ *
+ * @param phi  the Phi node
+ *
+ * @return 1 if Cast's where moved
+ */
+static int concretize_Phi_type(ir_node *phi)
+{
+       int       n_preds = get_Phi_n_preds(phi);
+       ir_node **pred    = ALLOCAN(ir_node*, n_preds);
+       ir_node  *nn, *blk;
+       ir_type  *totype;
+       ir_type  *fromtype;
+       int       i;
+
+       if (n_preds == 0)
+               return 0;
+       pred[0] = get_Phi_pred(phi, 0);
+
+       if (!is_Cast(pred[0]))
+               return 0;
+
+       if (!is_Cast_upcast(pred[0]))
+               return 0;
+
+       fromtype = get_irn_typeinfo_type(get_Cast_op(pred[0]));
+       totype   = get_Cast_type(pred[0]);
+
+       pred[0] = get_Cast_op(pred[0]);
+       for (i = 1; i < n_preds; ++i) {
+               pred[i] = get_Phi_pred(phi, i);
+               if (!is_Cast(pred[i]))
+                       return 0;
+               if (get_irn_typeinfo_type(get_Cast_op(pred[i])) != fromtype)
+                       return 0;
+               pred[i] = get_Cast_op(pred[i]);
+       }
+
+       /* Transform Phi */
+       blk = get_nodes_block(phi);
+       nn  = new_r_Phi(blk, n_preds, pred, get_irn_mode(phi));
+       set_irn_typeinfo_type(nn, fromtype);
+       nn  = new_r_Cast(blk, nn, totype);
+       set_irn_typeinfo_type(nn, totype);
+       exchange(phi, nn);
+       return 1;
 }
 
-void remove_Cmp_Null_cast(ir_node *cmp) {
-  ir_node *cast, *null, *new_null;
-  int cast_pos, null_pos;
-  type *fromtype;
-
-  cast = get_Cmp_left(cmp);
-  cast_pos = 0;
-  if (get_irn_op(cast) != op_Cast) {
-    null = cast;
-    null_pos = cast_pos;
-    cast = get_Cmp_right(cmp);
-    cast_pos = 1;
-    if (get_irn_op(cast) != op_Cast) return;
-  } else {
-    null = get_Cmp_right(cmp);
-    null_pos = 1;
-  }
-
-  if (get_irn_op(null) != op_Const) return;
-  if (!mode_is_reference(get_irn_mode(null))) return;
-  if (get_Const_tarval(null) != get_mode_null(get_irn_mode(null))) return;
-
-  /* Transform Cmp */
-  set_irn_n(cmp, cast_pos, get_Cast_op(cast));
-  fromtype = get_irn_typeinfo_type(get_Cast_op(cast));
-  new_null = new_Const_type(get_Const_tarval(null), fromtype);
-  set_irn_typeinfo_type(new_null, fromtype);
-  set_irn_n(cmp, null_pos, new_null);
-  n_casts_removed ++;
+/**
+ * Remove Casted null checks, i.e.
+ *
+ * Cmp(Cast(type, x_orig), NULL_type) -> Cmp(x_orig, NULL_orig)
+ *
+ * @param cmp  the Cmp node
+ *
+ * @return 1 if Cast's where removed
+ */
+static int remove_Cmp_Null_cast(ir_node *cmp)
+{
+       ir_graph *irg;
+       ir_node *cast, *null, *new_null;
+       int     cast_pos, null_pos;
+       ir_type *fromtype;
+       ir_mode *mode;
+
+       cast = get_Cmp_left(cmp);
+       if (!is_Cast(cast)) {
+               null     = cast;
+               null_pos = 0;
+               cast     = get_Cmp_right(cmp);
+               cast_pos = 1;
+               if (!is_Cast(cast))
+                       return 0;
+       } else {
+               null = get_Cmp_right(cmp);
+               cast_pos = 0;
+               null_pos = 1;
+       }
+
+       if (! is_Const(null))
+               return 0;
+       mode = get_irn_mode(null);
+       if (!mode_is_reference(mode))
+               return 0;
+       if (get_Const_tarval(null) != get_mode_null(mode))
+               return 0;
+
+       /* Transform Cmp */
+       irg = get_irn_irg(cmp);
+       set_irn_n(cmp, cast_pos, get_Cast_op(cast));
+       fromtype = get_irn_typeinfo_type(get_Cast_op(cast));
+       new_null = new_r_Const(irg, get_Const_tarval(null));
+       set_irn_typeinfo_type(new_null, fromtype);
+       set_irn_n(cmp, null_pos, new_null);
+       ++n_casts_removed;
+       return 1;
 }
 
-static void irn_optimize_class_cast(ir_node *n, void *env) {
-  if (get_irn_op(n) == op_Cast)
-    cancel_out_casts(n);
-  else if (get_irn_op(n) == op_Sel)
-    concretize_selected_entity(n);
-  else if (get_irn_op(n) == op_Phi)
-    concretize_Phi_type(n);
-  else if (get_irn_op(n) == op_Cmp)
-    remove_Cmp_Null_cast(n);
+/**
+ * Post-Walker: Optimize class casts (mostly by trying to remove them)
+ */
+static void irn_optimize_class_cast(ir_node *n, void *env)
+{
+       int *changed = (int*)env;
+
+       if (is_Cast(n))
+               *changed |= cancel_out_casts(n);
+       else if (is_Sel(n))
+               *changed |= concretize_selected_entity(n);
+       else if (is_Phi(n))
+               *changed |= concretize_Phi_type(n);
+       else if (is_Cmp(n))
+               *changed |= remove_Cmp_Null_cast(n);
 }
 
-void optimize_class_casts(void) {
-  int i, n_irgs = get_irp_n_irgs();
+void optimize_class_casts(void)
+{
+       int changed;
 
-  if (get_irp_typeinfo_state() != ir_typeinfo_consistent)
-    simple_analyse_types();
+#if 0
+       if (get_irp_typeinfo_state() != ir_typeinfo_consistent)
+               simple_analyse_types();
+#endif
 
-  all_irg_walk(NULL, irn_optimize_class_cast, NULL);
+       changed = 0;
+       all_irg_walk(NULL, irn_optimize_class_cast, &changed);
 
-  set_trouts_inconsistent();
-  for (i = 0; i < n_irgs; ++i)
-    set_irg_outs_inconsistent(get_irp_irg(i));
+       if (changed) {
+               set_trouts_inconsistent();
+       }
+
+       DB((dbg, SET_LEVEL_1, " Cast optimization: %zu Casts removed, %zu Sels concretized.\n",
+               n_casts_removed, n_sels_concretized));
+}
 
-  if (get_opt_optimize_class_casts_verbose() && get_firm_verbosity()) {
-    printf(" Cast optimization: %d Casts removed, %d sels concretized.\n",
-          n_casts_removed, n_sels_concretized);
-  }
+void firm_init_class_casts_opt(void)
+{
+       FIRM_DBG_REGISTER(dbg, "firm.opt.tropt");
 }