X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Ftropt.c;h=7bc32cf1e1e8898334d03497516a3cd3b157de68;hb=8c9921a1fc166552f6e416434fd8394a4fc210a3;hp=fc089270b3b07acc952b3f60fee24703232ba437;hpb=9d4e23060441530a20af5d331268435bfe18f305;p=libfirm

diff --git a/ir/opt/tropt.c b/ir/opt/tropt.c
index fc089270b..7bc32cf1e 100644
--- 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"
 
@@ -62,20 +61,9 @@ 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 = 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);
-	}
+	ir_type *res = find_pointer_type_to_type(tp);
+	if (res == firm_unknown_type)
+		res = new_type_pointer(tp);
 
 	return res;
 }
@@ -108,8 +96,8 @@ static ir_node *normalize_values_type(ir_type *totype, ir_node *pred)
 	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) ) {
+	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;
 	}
@@ -118,11 +106,12 @@ static ir_node *normalize_values_type(ir_type *totype, ir_node *pred)
 
 	if (is_SubClass_of(totype, fromtype)) {
 		/* downcast */
-		while (get_class_subtype_index(fromtype, totype) == -1) {
+		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;
-			int i, n_subtypes = get_class_n_subtypes(fromtype);
+			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))
@@ -135,15 +124,14 @@ static ir_node *normalize_values_type(ir_type *totype, ir_node *pred)
 			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) {
+		while (get_class_supertype_index(fromtype, totype) == (size_t)-1) {
 			/* Insert a cast to a supertype of fromtype. */
 			ir_type *new_type = NULL;
-			int i, n_supertypes = get_class_n_supertypes(fromtype);
+			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))
@@ -156,7 +144,6 @@ static ir_node *normalize_values_type(ir_type *totype, ir_node *pred)
 			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;
@@ -175,7 +162,8 @@ static void normalize_irn_class_cast(ir_node *n, void *env)
 		res = normalize_values_type(totype, pred);
 		set_Cast_op(n, res);
 	} else if (is_Call(n)) {
-		int i, n_params = get_Call_n_params(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));
@@ -336,13 +324,13 @@ static int concretize_selected_entity(ir_node *sel)
 
 		/* 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) == -1)
+		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) == -1)
+		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 */
@@ -486,14 +474,6 @@ void optimize_class_casts(void)
 	changed = 0;
 	all_irg_walk(NULL, irn_optimize_class_cast, &changed);
 
-	if (changed) {
-		size_t i, n;
-
-		set_trouts_inconsistent();
-		for (i = 0, n = get_irp_n_irgs(); i < n; ++i)
-			set_irg_outs_inconsistent(get_irp_irg(i));
-	}
-
 	DB((dbg, SET_LEVEL_1, " Cast optimization: %zu Casts removed, %zu Sels concretized.\n",
 		n_casts_removed, n_sels_concretized));
 }