bechordal: Remove remnants of the long gone split phase.

[libfirm] / ir / opt / tropt.c

diff --git a/ir/opt/tropt.c b/ir/opt/tropt.c
index bb55255..49ded90 100644 (file)
--- a/ir/opt/tropt.c
+++ b/ir/opt/tropt.c
@@ -22,7 +22,6 @@
  * @brief   Perform optimizations of the type representation.
  * @date    20.4.2005
  * @author  Goetz Lindenmaier
- * @version $Id$
  */
 #include "config.h"
 
@@ -63,7 +62,7 @@ static gen_pointer_type_to_func gen_pointer_type_to = default_gen_pointer_type_t
 static ir_type *default_gen_pointer_type_to(ir_type *tp)
 {
        ir_type *res = find_pointer_type_to_type(tp);
-       if (res == firm_unknown_type)
+       if (is_unknown_type(res))
                res = new_type_pointer(tp);
 
        return res;
@@ -177,9 +176,8 @@ static void normalize_irn_class_cast(ir_node *n, void *env)
 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.");
+              "Cannot normalize irregular casts.");
        if (get_irg_class_cast_state(irg) == ir_class_casts_normalized) {
-               verify_irg_class_cast_state(irg);
                return;
        }
 
@@ -298,18 +296,14 @@ static int cancel_out_casts(ir_node *cast)
  */
 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);
+       int res = 0;
 
+       ir_entity *sel_ent = get_Sel_entity(sel);
+       ir_node   *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);
+               ir_type *cast_tp = get_Cast_type(cast);
+               ir_node *ptr     = get_Cast_op(cast);
+               ir_type *orig_tp = get_irn_typeinfo_type(ptr);
 
                /* we handle only classes */
                if (!is_Pointer_type(orig_tp)|| !is_Pointer_type(cast_tp))
@@ -328,7 +322,7 @@ static int concretize_selected_entity(ir_node *sel)
                if (get_class_member_index(cast_tp, sel_ent) == (size_t)-1)
                        return res;
 
-               new_ent = resolve_ent_polymorphy(orig_tp, sel_ent);
+               ir_entity *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)