X-Git-Url: http://nitlanguage.org

diff --git a/src/compiler/separate_compiler.nit b/src/compiler/separate_compiler.nit
index 491ebfe..c298f93 100644
--- a/src/compiler/separate_compiler.nit
+++ b/src/compiler/separate_compiler.nit
@@ -90,12 +90,55 @@ redef class ModelBuilder
 		self.toolcontext.info("*** GENERATING C ***", 1)
 
 		var compiler = new SeparateCompiler(mainmodule, self, runtime_type_analysis)
+		compiler.do_compilation
+		compiler.display_stats
+
+		var time1 = get_time
+		self.toolcontext.info("*** END GENERATING C: {time1-time0} ***", 2)
+		write_and_make(compiler)
+	end
+
+	# Count number of invocations by VFT
+	private var nb_invok_by_tables = 0
+	# Count number of invocations by direct call
+	private var nb_invok_by_direct = 0
+	# Count number of invocations by inlining
+	private var nb_invok_by_inline = 0
+end
+
+# Singleton that store the knowledge about the separate compilation process
+class SeparateCompiler
+	super AbstractCompiler
+
+	redef type VISITOR: SeparateCompilerVisitor
+
+	# The result of the RTA (used to know live types and methods)
+	var runtime_type_analysis: nullable RapidTypeAnalysis
+
+	private var undead_types: Set[MType] = new HashSet[MType]
+	private var live_unresolved_types: Map[MClassDef, Set[MType]] = new HashMap[MClassDef, HashSet[MType]]
+
+	private var type_ids: Map[MType, Int] is noinit
+	private var type_colors: Map[MType, Int] is noinit
+	private var opentype_colors: Map[MType, Int] is noinit
+	protected var method_colors: Map[PropertyLayoutElement, Int] is noinit
+	protected var attr_colors: Map[MAttribute, Int] is noinit
+
+	init do
+		var file = new_file("nit.common")
+		self.header = new CodeWriter(file)
+		self.compile_box_kinds
+	end
+
+	redef fun do_compilation
+	do
+		var compiler = self
 		compiler.compile_header
 
 		var c_name = mainmodule.c_name
 
 		# compile class structures
-		self.toolcontext.info("Property coloring", 2)
+		modelbuilder.toolcontext.info("Property coloring", 2)
 		compiler.new_file("{c_name}.classes")
 		compiler.do_property_coloring
 		for m in mainmodule.in_importation.greaters do
@@ -113,14 +156,22 @@ redef class ModelBuilder
 
 		# compile methods
 		for m in mainmodule.in_importation.greaters do
-			self.toolcontext.info("Generate C for module {m.full_name}", 2)
+			modelbuilder.toolcontext.info("Generate C for module {m.full_name}", 2)
 			compiler.new_file("{m.c_name}.sep")
 			compiler.compile_module_to_c(m)
 		end
 
 		# compile live & cast type structures
-		self.toolcontext.info("Type coloring", 2)
+		modelbuilder.toolcontext.info("Type coloring", 2)
 		compiler.new_file("{c_name}.types")
+		compiler.compile_types
+	end
+
+	# Color and compile type structures and cast information
+	fun compile_types
+	do
+		var compiler = self
+
 		var mtypes = compiler.do_type_coloring
 		for t in mtypes do
 			compiler.compile_type_to_c(t)
@@ -131,43 +182,6 @@ redef class ModelBuilder
 			compiler.compile_type_to_c(t)
 		end
 
-		compiler.display_stats
-
-		var time1 = get_time
-		self.toolcontext.info("*** END GENERATING C: {time1-time0} ***", 2)
-		write_and_make(compiler)
-	end
-
-	# Count number of invocations by VFT
-	private var nb_invok_by_tables = 0
-	# Count number of invocations by direct call
-	private var nb_invok_by_direct = 0
-	# Count number of invocations by inlining
-	private var nb_invok_by_inline = 0
-end
-
-# Singleton that store the knowledge about the separate compilation process
-class SeparateCompiler
-	super AbstractCompiler
-
-	redef type VISITOR: SeparateCompilerVisitor
-
-	# The result of the RTA (used to know live types and methods)
-	var runtime_type_analysis: nullable RapidTypeAnalysis
-
-	private var undead_types: Set[MType] = new HashSet[MType]
-	private var live_unresolved_types: Map[MClassDef, Set[MType]] = new HashMap[MClassDef, HashSet[MType]]
-
-	private var type_ids: Map[MType, Int] is noinit
-	private var type_colors: Map[MType, Int] is noinit
-	private var opentype_colors: Map[MType, Int] is noinit
-	protected var method_colors: Map[PropertyLayoutElement, Int] is noinit
-	protected var attr_colors: Map[MAttribute, Int] is noinit
-
-	init do
-		var file = new_file("nit.common")
-		self.header = new CodeWriter(file)
-		self.compile_box_kinds
 	end
 
 	redef fun compile_header_structs do
@@ -418,13 +432,12 @@ class SeparateCompiler
 		var live_cast_types = runtime_type_analysis.live_cast_types
 		var mtypes = new HashSet[MType]
 		mtypes.add_all(live_types)
-		mtypes.add_all(live_cast_types)
 		for c in self.box_kinds.keys do
 			mtypes.add(c.mclass_type)
 		end
 
 		# Compute colors
-		var poset = poset_from_mtypes(mtypes)
+		var poset = poset_from_mtypes(mtypes, live_cast_types)
 		var colorer = new POSetColorer[MType]
 		colorer.colorize(poset)
 		type_ids = colorer.ids
@@ -437,12 +450,13 @@ class SeparateCompiler
 		return poset
 	end
 
-	private fun poset_from_mtypes(mtypes: Set[MType]): POSet[MType] do
+	private fun poset_from_mtypes(mtypes, cast_types: Set[MType]): POSet[MType] do
 		var poset = new POSet[MType]
 		for e in mtypes do
 			poset.add_node(e)
-			for o in mtypes do
+			for o in cast_types do
 				if e == o then continue
+				poset.add_node(o)
 				if e.is_subtype(mainmodule, null, o) then
 					poset.add_edge(e, o)
 				end