tr: Add and use new_type_segment().

[libfirm] / ir / tr / tr_inheritance.c

diff --git a/ir/tr/tr_inheritance.c b/ir/tr/tr_inheritance.c
index 529bb6d..254f4d2 100644 (file)
--- a/ir/tr/tr_inheritance.c
+++ b/ir/tr/tr_inheritance.c
@@ -58,7 +58,6 @@ static void copy_entities_from_superclass(ir_type *clss, void *env)
 
        for (i = 0; i < get_class_n_supertypes(clss); i++) {
                super = get_class_supertype(clss, i);
-               assert(is_Class_type(super) && "not a class");
                for (j = 0; j < get_class_n_members(super); j++) {
                        inhent = get_class_member(super, j);
                        /* check whether inhent is already overwritten */
@@ -231,8 +230,6 @@ static void compute_down_closure(ir_type *tp)
        size_t i, n_subtypes, n_members, n_supertypes;
        ir_visited_t master_visited = get_master_type_visited();
 
-       assert(is_Class_type(tp));
-
        set_type_visited(tp, master_visited-1);
 
        /* Recursive descend. */
@@ -286,8 +283,6 @@ static void compute_up_closure(ir_type *tp)
        size_t i, n_subtypes, n_members, n_supertypes;
        ir_visited_t master_visited = get_master_type_visited();
 
-       assert(is_Class_type(tp));
-
        set_type_visited(tp, master_visited-1);
 
        /* Recursive descend. */
@@ -396,7 +391,6 @@ void compute_inh_transitive_closure(void)
 void free_inh_transitive_closure(void)
 {
        if (tr_inh_trans_set) {
-               tr_inh_trans_tp *elt;
                foreach_set(tr_inh_trans_set, tr_inh_trans_tp, elt) {
                        del_pset(elt->directions[d_up]);
                        del_pset(elt->directions[d_down]);
@@ -412,13 +406,13 @@ void free_inh_transitive_closure(void)
 ir_type *get_class_trans_subtype_first(const ir_type *tp)
 {
        assert_valid_state();
-       return (ir_type*)pset_first(get_type_map(tp, d_down));
+       return pset_first(ir_type, get_type_map(tp, d_down));
 }
 
 ir_type *get_class_trans_subtype_next(const ir_type *tp)
 {
        assert_valid_state();
-       return (ir_type*)pset_next(get_type_map(tp, d_down));
+       return pset_next(ir_type, get_type_map(tp, d_down));
 }
 
 int is_class_trans_subtype(const ir_type *tp, const ir_type *subtp)
@@ -432,13 +426,13 @@ int is_class_trans_subtype(const ir_type *tp, const ir_type *subtp)
 ir_type *get_class_trans_supertype_first(const ir_type *tp)
 {
        assert_valid_state();
-       return (ir_type*)pset_first(get_type_map(tp, d_up));
+       return pset_first(ir_type, get_type_map(tp, d_up));
 }
 
 ir_type *get_class_trans_supertype_next(const ir_type *tp)
 {
        assert_valid_state();
-       return (ir_type*)pset_next(get_type_map(tp, d_up));
+       return pset_next(ir_type, get_type_map(tp, d_up));
 }
 
 /* - overwrittenby ------------------------------------------------------- */
@@ -446,13 +440,13 @@ ir_type *get_class_trans_supertype_next(const ir_type *tp)
 ir_entity *get_entity_trans_overwrittenby_first(const ir_entity *ent)
 {
        assert_valid_state();
-       return (ir_entity*)pset_first(get_entity_map(ent, d_down));
+       return pset_first(ir_entity, get_entity_map(ent, d_down));
 }
 
 ir_entity *get_entity_trans_overwrittenby_next(const ir_entity *ent)
 {
        assert_valid_state();
-       return (ir_entity*)pset_next(get_entity_map(ent, d_down));
+       return pset_next(ir_entity, get_entity_map(ent, d_down));
 }
 
 /* - overwrites ---------------------------------------------------------- */
@@ -461,13 +455,13 @@ ir_entity *get_entity_trans_overwrittenby_next(const ir_entity *ent)
 ir_entity *get_entity_trans_overwrites_first(const ir_entity *ent)
 {
        assert_valid_state();
-       return (ir_entity*)pset_first(get_entity_map(ent, d_up));
+       return pset_first(ir_entity, get_entity_map(ent, d_up));
 }
 
 ir_entity *get_entity_trans_overwrites_next(const ir_entity *ent)
 {
        assert_valid_state();
-       return (ir_entity*)pset_next(get_entity_map(ent, d_up));
+       return pset_next(ir_entity, get_entity_map(ent, d_up));
 }
 
 
@@ -577,38 +571,3 @@ ir_entity *resolve_ent_polymorphy(ir_type *dynamic_class, ir_entity *static_ent)
 
        return res;
 }
-
-
-
-/* ----------------------------------------------------------------------- */
-/* Class cast state handling.                                              */
-/* ----------------------------------------------------------------------- */
-
-/* - State handling. ----------------------------------------- */
-
-void set_irg_class_cast_state(ir_graph *irg, ir_class_cast_state s)
-{
-       if (get_irp_class_cast_state() > s)
-               set_irp_class_cast_state(s);
-       irg->class_cast_state = s;
-}
-
-ir_class_cast_state get_irg_class_cast_state(const ir_graph *irg)
-{
-       return irg->class_cast_state;
-}
-
-void set_irp_class_cast_state(ir_class_cast_state s)
-{
-#ifndef NDEBUG
-       size_t i, n;
-       for (i = 0, n = get_irp_n_irgs(); i < n; ++i)
-               assert(get_irg_class_cast_state(get_irp_irg(i)) >= s);
-#endif
-       irp->class_cast_state = s;
-}
-
-ir_class_cast_state get_irp_class_cast_state(void)
-{
-       return irp->class_cast_state;
-}