X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype_finalization.c;h=7fec33103ca6470cc2d5c68e4474c9653417d4d3;hb=e88385016800d3c56c3fa09770e9f7995c42e106;hp=ede6aff7890243c900c5e777cbbf706adb24f3e5;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/tr/type_finalization.c b/ir/tr/type_finalization.c
index ede6aff78..7fec33103 100644
--- a/ir/tr/type_finalization.c
+++ b/ir/tr/type_finalization.c
@@ -24,9 +24,7 @@
  * @author  Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "typerep.h"
 #include "irprog_t.h"
@@ -36,11 +34,12 @@
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 
-static void do_finalization(type_or_ent *tore, void *env) {
-	ir_type *glob_tp = env;
+static void do_finalization(type_or_ent tore, void *env)
+{
+	ir_type *glob_tp = (ir_type*)env;
 
-	if (is_type(tore)) {
-		ir_type *cls = (ir_type *)tore;
+	if (is_type(tore.typ)) {
+		ir_type *cls = tore.typ;
 
 		if (! is_Class_type(cls) || cls == glob_tp)
 			return;
@@ -49,13 +48,13 @@ static void do_finalization(type_or_ent *tore, void *env) {
 			return;
 		if (get_class_n_subtypes(cls) == 0) {
 			/* Note that we set the final property even for the
-			   frame/tls types this way. Should not made any problems. */
+			   frame/global types this way. Should not made any problems. */
 			set_class_final(cls, 1);
 			DB((dbg, LEVEL_1, " made final Class %s\n",
-				get_type_name(cls)));
+				get_class_name(cls)));
 		}
 	} else {
-		ir_entity *ent = (ir_entity *)tore;
+		ir_entity *ent = tore.ent;
 		ir_type *owner;
 
 		if (is_entity_final(ent))
@@ -70,11 +69,11 @@ static void do_finalization(type_or_ent *tore, void *env) {
 			assert(get_entity_n_overwrittenby(ent) == 0);
 			set_entity_final(ent, 1);
 			DB((dbg, LEVEL_1, " made final %s::%s\n",
-				get_type_name(owner), get_entity_name(ent)));
+				get_compound_name(owner), get_entity_name(ent)));
 		} else if (get_entity_n_overwrittenby(ent) == 0) {
 			set_entity_final(ent, 1);
 			DB((dbg, LEVEL_1, " made final %s::%s\n",
-				get_type_name(owner), get_entity_name(ent)));
+				get_compound_name(owner), get_entity_name(ent)));
 		}
 	}
 }  /* do_finalization */
@@ -85,9 +84,10 @@ static void do_finalization(type_or_ent *tore, void *env) {
  * After this is done, all classes and entities that are not overridden
  * anymore have the final property set.
  */
-void types_calc_finalization(void) {
- 	if (! get_opt_closed_world())
- 		return;
+void types_calc_finalization(void)
+{
+	if (! get_opt_closed_world())
+		return;
 
 	FIRM_DBG_REGISTER(dbg, "firm.tr.finalization");