X-Git-Url: http://nitlanguage.org?ds=sidebyside

diff --git a/src/separate_compiler.nit b/src/separate_compiler.nit
index a3a10a6..a497593 100644
--- a/src/separate_compiler.nit
+++ b/src/separate_compiler.nit
@@ -17,95 +17,61 @@ module separate_compiler
 
 
 import global_compiler # TODO better separation of concerns
-intrude import coloring
+import coloring
+
 redef class ToolContext
 	# --separate
 	var opt_separate: OptionBool = new OptionBool("Use separate compilation", "--separate")
 
+	# --no-inline-intern
+	var opt_no_inline_intern: OptionBool = new OptionBool("Do not inline call to intern methods", "--no-inline-intern")
+
+	# --inline-coloring-numbers
+	var opt_inline_coloring_numbers: OptionBool = new OptionBool("Inline colors and ids", "--inline-coloring-numbers")
+
+	# --use-naive-coloring
+	var opt_use_naive_coloring: OptionBool = new OptionBool("Colorize items incrementaly, used to simulate binary matrix typing", "--use-naive-coloring")
+
 	redef init
 	do
 		super
 		self.option_context.add_option(self.opt_separate)
+		self.option_context.add_option(self.opt_no_inline_intern)
+		self.option_context.add_option(self.opt_inline_coloring_numbers)
+		self.option_context.add_option(self.opt_use_naive_coloring)
 	end
 end
 
 redef class ModelBuilder
-	redef fun run_global_compiler(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis)
-	do
-		# Hijack the run_global_compiler to run the separate one if requested.
-		if self.toolcontext.opt_separate.value then
-			run_separate_compiler(mainmodule, runtime_type_analysis)
-		else
-			super
-		end
-	end
-
 	fun run_separate_compiler(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis)
 	do
 		var time0 = get_time
 		self.toolcontext.info("*** COMPILING TO C ***", 1)
 
 		var compiler = new SeparateCompiler(mainmodule, runtime_type_analysis, self)
-		var v = new SeparateCompilerVisitor(compiler)
-		compiler.header = v
-		v.add_decl("#include <stdlib.h>")
-		v.add_decl("#include <stdio.h>")
-		v.add_decl("#include <string.h>")
-		v.add_decl("#include <gc/gc.h>")
-		v.add_decl("typedef void(*nitmethod_t)(void); /* general C type representing a Nit method. */")
-		v.add_decl("typedef void* nitattribute_t; /* general C type representing a Nit attribute. */")
-
-		# Class abstract representation
-		v.add_decl("struct class \{ nitmethod_t vft[1]; \}; /* general C type representing a Nit class. */")
-		# Type abstract representation
-		v.add_decl("struct type \{ int id; int color; struct fts_table *fts_table; int type_table[1]; \}; /* general C type representing a Nit type. */")
-		v.add_decl("struct fts_table \{ struct type *fts[1]; \}; /* fts list of a C type representation. */")
-		# Instance abstract representation
-		v.add_decl("typedef struct \{ struct type *type; struct class *class; nitattribute_t attrs[1]; \} val; /* general C type representing a Nit instance. */")
-
-		# Class names (for the class_name and output_class_name methods)
-		v.add_decl("extern const char const * class_names[];")
-		v.add("const char const * class_names[] = \{")
-		for t in runtime_type_analysis.live_types do
-			v.add("\"{t}\",")
+
+		# compile class structures
+		for m in mainmodule.in_importation.greaters do
+			for mclass in m.intro_mclasses do
+				compiler.compile_class_to_c(mclass)
+			end
 		end
-		v.add("\};")
 
 		# The main function of the C
+		compiler.compile_main_function
 
-		v = new SeparateCompilerVisitor(compiler)
-		v.add_decl("int glob_argc;")
-		v.add_decl("char **glob_argv;")
-		v.add_decl("val *glob_sys;")
-		v.add_decl("int main(int argc, char** argv) \{")
-		v.add("glob_argc = argc; glob_argv = argv;")
-		var main_type = mainmodule.sys_type
-		if main_type == null then return # Nothing to compile
-		var glob_sys = v.init_instance(main_type)
-		v.add("glob_sys = {glob_sys};")
-		var main_init = mainmodule.try_get_primitive_method("init", main_type)
-		if main_init != null then
-			v.send(main_init, [glob_sys])
-		end
-		var main_method = mainmodule.try_get_primitive_method("main", main_type)
-		if main_method != null then
-			v.send(main_method, [glob_sys])
-		end
-		v.add("\}")
-
+		# compile methods
 		for m in mainmodule.in_importation.greaters do
 			compiler.compile_module_to_c(m)
-			for mclass in m.intro_mclasses do
-				compiler.compile_class_to_c(mclass)
-			end
 		end
 
 		# compile live & cast type structures
-		var mtypes = compiler.do_global_type_coloring
+		var mtypes = compiler.do_type_coloring
 		for t in mtypes do
 			compiler.compile_type_to_c(t)
 		end
 
+		# compile live generic types selection structures
 		for mclass in model.mclasses do
 			compiler.compile_live_gentype_to_c(mclass)
 		end
@@ -118,162 +84,211 @@ end
 class SeparateCompiler
 	super GlobalCompiler # TODO better separation of concerns
 
-	private var undead_types: Set[MClassType] = new HashSet[MClassType]
-	protected var typeids: HashMap[MClassType, Int] = new HashMap[MClassType, Int]
+	private var undead_types: Set[MType] = new HashSet[MType]
+	protected var typeids: HashMap[MType, Int] protected writable = new HashMap[MType, Int]
 
-	private var type_colors: Map[MClassType, Int] = typeids
-	private var type_tables: nullable Map[MClassType, Array[nullable MClassType]] = null
+	private var type_colors: Map[MType, Int] = typeids
+	private var type_tables: nullable Map[MType, Array[nullable MType]] = null
+
+	private var livetypes_colors: nullable Map[MType, Int]
 	private var livetypes_tables: nullable Map[MClass, Array[nullable Object]]
 	private var livetypes_tables_sizes: nullable Map[MClass, Array[Int]]
 
-	private var class_colors: Map[MClass, Int]
+	protected var class_coloring: ClassColoring
+	protected var class_colors: Map[MClass, Int]
+
+	protected var method_colors: Map[MMethod, Int]
+	protected var method_tables: Map[MClass, Array[nullable MMethodDef]]
 
-	private var method_colors: Map[MMethod, Int]
-	private var method_tables: Map[MClass, Array[nullable MMethodDef]]
+	protected var attr_colors: Map[MAttribute, Int]
+	protected var attr_tables: Map[MClass, Array[nullable MAttributeDef]]
 
-	private var attr_colors: Map[MAttribute, Int]
-	private var attr_tables: Map[MClass, Array[nullable MAttributeDef]]
+	protected var vt_colors: Map[MVirtualTypeProp, Int]
+	protected var vt_tables: Map[MClass, Array[nullable MVirtualTypeDef]]
 
-	private var ft_colors: Map[MParameterType, Int]
-	private var ft_tables: Map[MClass, Array[nullable MParameterType]]
+	protected var ft_colors: nullable Map[MParameterType, Int]
+	protected var ft_tables: nullable Map[MClass, Array[nullable MParameterType]]
 
 	init(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis, mmbuilder: ModelBuilder) do
+		self.do_property_coloring
+		self.compile_box_kinds
+	end
+
+	redef fun compile_header_structs do
+		self.header.add_decl("typedef void(*nitmethod_t)(void); /* general C type representing a Nit method. */")
+		self.header.add_decl("typedef void* nitattribute_t; /* general C type representing a Nit attribute. */")
+		self.header.add_decl("struct class \{ int box_kind; nitmethod_t vft[1]; \}; /* general C type representing a Nit class. */")
+		self.header.add_decl("struct type \{ int id; int color; int livecolor; short int is_nullable; struct vts_table *vts_table; struct fts_table *fts_table; int table_size; int type_table[1]; \}; /* general C type representing a Nit type. */")
+		self.header.add_decl("struct fts_table \{ struct type *fts[1]; \}; /* fts list of a C type representation. */")
+		self.header.add_decl("struct vts_table \{ struct type *vts[1]; \}; /* vts list of a C type representation. */")
+		self.header.add_decl("typedef struct \{ struct type *type; struct class *class; nitattribute_t attrs[1]; \} val; /* general C type representing a Nit instance. */")
+	end
+
+	redef fun compile_class_names do
+		# Build type names table
+		var type_array = new Array[nullable MType]
+		for t, i in typeids do
+			if i >= type_array.length then
+				type_array[i] = null
+			end
+			type_array[i] = t
+		end
+
+		var v = self.new_visitor
+		self.header.add_decl("extern const char const * class_names[];")
+		v.add("const char const * class_names[] = \{")
+		for t in type_array do
+			if t == null then
+				v.add("NULL,")
+			else
+				v.add("\"{t}\",")
+			end
+		end
+		v.add("\};")
+	end
+
+	fun compile_box_kinds
+	do
+		# Collect all bas box class
+		# FIXME: this is not completely fine with a separate compilation scheme
+		for classname in ["Int", "Bool", "Char", "Float", "NativeString", "Pointer"] do
+			var classes = self.mainmodule.model.get_mclasses_by_name(classname)
+			if classes == null then continue
+			assert classes.length == 1 else print classes.join(", ")
+			self.box_kinds[classes.first] = self.box_kinds.length + 1
+		end
+	end
+
+	var box_kinds = new HashMap[MClass, Int]
+
+	fun box_kind_of(mclass: MClass): Int
+	do
+		if mclass.mclass_type.ctype == "val*" then
+			return 0
+		else if mclass.kind == extern_kind then
+			return self.box_kinds[self.mainmodule.get_primitive_class("Pointer")]
+		else
+			return self.box_kinds[mclass]
+		end
+
+	end
+
+	fun compile_color_consts(colors: Map[Object, Int]) do
+		for m, c in colors do
+			if m isa MProperty then
+				if modelbuilder.toolcontext.opt_inline_coloring_numbers.value then
+					self.header.add_decl("#define {m.const_color} {c}")
+				else
+					self.header.add_decl("extern const int {m.const_color};")
+					self.header.add("const int {m.const_color} = {c};")
+				end
+			else if m isa MType then
+				if modelbuilder.toolcontext.opt_inline_coloring_numbers.value then
+					self.header.add_decl("#define {m.const_color} {c}")
+				else
+					self.header.add_decl("extern const int {m.const_color};")
+					self.header.add("const int {m.const_color} = {c};")
+				end
+			end
+		end
+	end
+
+	# colorize classe properties
+	fun do_property_coloring do
+
 		# classes coloration
-		var class_coloring = new ClassColoring(mainmodule)
-		self.class_colors = class_coloring.colorize(mmbuilder.model.mclasses)
+		if modelbuilder.toolcontext.opt_use_naive_coloring.value then
+			self.class_coloring = new NaiveClassColoring(mainmodule)
+		else
+			self.class_coloring = new ClassColoring(mainmodule)
+		end
+		self.class_colors = class_coloring.colorize(modelbuilder.model.mclasses)
 
 		# methods coloration
-		var method_coloring = new MethodColoring(class_coloring)
+		var method_coloring = new MethodColoring(self.class_coloring)
 		self.method_colors = method_coloring.colorize
 		self.method_tables = method_coloring.build_property_tables
+		self.compile_color_consts(self.method_colors)
 
 		# attributes coloration
 		var attribute_coloring = new AttributeColoring(class_coloring)
 		self.attr_colors = attribute_coloring.colorize
 		self.attr_tables = attribute_coloring.build_property_tables
+		self.compile_color_consts(self.attr_colors)
 
-		# fts coloration
-		var ft_coloring = new FTColoring(class_coloring)
-		self.ft_colors = ft_coloring.colorize
-		self.ft_tables = ft_coloring.build_ft_tables
+		# vt coloration
+		var vt_coloring = new VTColoring(class_coloring)
+		self.vt_colors = vt_coloring.colorize
+		self.vt_tables = vt_coloring.build_property_tables
+		self.compile_color_consts(self.vt_colors)
 	end
 
 	# colorize live types of the program
-	private fun do_global_type_coloring: Set[MClassType] do
-		var mtypes = new HashSet[MClassType]
-		#print "undead types:"
-		#for t in self.undead_types do
-		#	print t
-		#end
-		#print "live types:"
-		#for t in runtime_type_analysis.live_types do
-		#	print t
-		#end
-		#print "cast types:"
-		#for t in runtime_type_analysis.live_cast_types do
-		#	print t
-		#end
-		#print "--"
+	private fun do_type_coloring: Set[MType] do
+		var mtypes = new HashSet[MType]
 		mtypes.add_all(self.runtime_type_analysis.live_types)
 		mtypes.add_all(self.runtime_type_analysis.live_cast_types)
 		mtypes.add_all(self.undead_types)
 
-		# add formal types arguments to mtypes
+		self.undead_types.clear
 		for mtype in mtypes do
+			# add formal types arguments to mtypes
 			if mtype isa MGenericType then
-				#TODO do it recursive
 				for ft in mtype.arguments do
-					if ft isa MNullableType then ft = ft.mtype
-					mtypes.add(ft.as(MClassType))
+					if ft.need_anchor then
+						print("Why do we need anchor here ?")
+						abort
+					end
+					self.undead_types.add(ft)
+				end
+			end
+			var mclass_type: MClassType
+			if mtype isa MNullableType then
+				mclass_type = mtype.mtype.as(MClassType)
+			else
+				mclass_type = mtype.as(MClassType)
+			end
+			# add virtual types to mtypes
+			for vt in self.vt_tables[mclass_type.mclass] do
+				if vt != null then
+					var anchored = vt.bound.anchor_to(self.mainmodule, mclass_type)
+					self.undead_types.add(anchored)
 				end
 			end
 		end
+		mtypes.add_all(self.undead_types)
 
 		# set type unique id
 		for mtype in mtypes do
 			self.typeids[mtype] = self.typeids.length
 		end
 
-		# build livetypes tables
-		self.livetypes_tables = new HashMap[MClass, Array[nullable Object]]
-		self.livetypes_tables_sizes = new HashMap[MClass, Array[Int]]
-		for mtype in mtypes do
-			if mtype isa MGenericType then
-				var table: Array[nullable Object]
-				var sizes: Array[Int]
-				if livetypes_tables.has_key(mtype.mclass) then
-					table = livetypes_tables[mtype.mclass]
-				else
-					table = new Array[nullable Object]
-					self.livetypes_tables[mtype.mclass] = table
-				end
-				if livetypes_tables_sizes.has_key(mtype.mclass) then
-					sizes = livetypes_tables_sizes[mtype.mclass]
-				else
-					sizes = new Array[Int]
-					self.livetypes_tables_sizes[mtype.mclass] = sizes
-				end
-				build_livetype_table(mtype, 0, table, sizes)
-			end
+		# fts coloration for non-erased compilation
+		var ft_coloring = new FTColoring(class_coloring)
+		self.ft_colors = ft_coloring.colorize
+		self.ft_tables = ft_coloring.build_ft_tables
+		self.compile_color_consts(self.ft_colors.as(not null))
+
+		# colorize live entries
+		var entries_coloring = new LiveEntryColoring
+		self.livetypes_colors = entries_coloring.colorize(mtypes)
+		self.livetypes_tables = entries_coloring.build_livetype_tables(mtypes)
+		self.livetypes_tables_sizes = entries_coloring.livetypes_tables_sizes
+
+		# colorize types
+		var type_coloring
+		if modelbuilder.toolcontext.opt_use_naive_coloring.value then
+			type_coloring = new NaiveTypeColoring(self.mainmodule, mtypes)
+		else
+			type_coloring = new TypeColoring(self.mainmodule, mtypes)
 		end
-
-		# colorize
-		var type_coloring = new TypeColoring(self.mainmodule, self.runtime_type_analysis)
 		self.type_colors = type_coloring.colorize(mtypes)
 		self.type_tables = type_coloring.build_type_tables(mtypes, type_colors)
 
-		return mtypes
-	end
-
-	# build live gentype table recursively
-	private fun build_livetype_table(mtype: MGenericType, current_rank: Int, table: Array[nullable Object], sizes: Array[Int]) do
-		var ft = mtype.arguments[current_rank]
-		if ft isa MNullableType then ft = ft.mtype
-		var id = self.typeids[ft.as(MClassType)]
-
-		if current_rank >= sizes.length then
-			sizes[current_rank] = id + 1
-		else if id >= sizes[current_rank] then
-			sizes[current_rank] = id + 1
-		end
-
-		if id > table.length then
-			for i in [table.length .. id[ do table[i] = null
-		end
-
-		if current_rank == mtype.arguments.length - 1 then
-			table[id] = mtype
-		else
-			var ft_table = new Array[nullable Object]
-			table[id] = ft_table
-			build_livetype_table(mtype, current_rank + 1, ft_table, sizes)
-		end
-	end
+		# for the class_name and output_class_name methods
+		self.compile_class_names
 
-	private fun add_to_livetypes_table(table: Array[nullable Object], ft: MClassType) do
-		var id = self.typeids[ft]
-		for i in [table.length .. id[ do
-			table[i] = null
-		end
-		table[id] = ft
-	end
-
-	private fun compile_livetype_table(table: Array[nullable Object], buffer: Buffer, depth: Int, max: Int) do
-		for obj in table do
-			if obj == null then
-				if depth == max then
-					buffer.append("NULL,\n")
-				else
-					buffer.append("\{\},\n")
-				end
-			else if obj isa MClassType then
-				buffer.append("(struct type*) &type_{obj.c_name}, /* {obj} */\n")
-			else if obj isa Array[nullable Object] then
-				buffer.append("\{\n")
-				compile_livetype_table(obj, buffer, depth + 1, max)
-				buffer.append("\},\n")
-			end
-		end
+		return mtypes
 	end
 
 	# declare live generic types tables selection
@@ -298,6 +313,24 @@ class SeparateCompiler
 		end
 	end
 
+	private fun compile_livetype_table(table: Array[nullable Object], buffer: Buffer, depth: Int, max: Int) do
+		for obj in table do
+			if obj == null then
+				if depth == max then
+					buffer.append("NULL,\n")
+				else
+					buffer.append("\{\},\n")
+				end
+			else if obj isa MClassType then
+				buffer.append("(struct type*) &type_{obj.c_name}, /* {obj} */\n")
+			else if obj isa Array[nullable Object] then
+				buffer.append("\{\n")
+				compile_livetype_table(obj, buffer, depth + 1, max)
+				buffer.append("\},\n")
+			end
+		end
+	end
+
 	# Separately compile all the method definitions of the module
 	fun compile_module_to_c(mmodule: MModule)
 	do
@@ -307,7 +340,7 @@ class SeparateCompiler
 				#print "compile {pd} @ {cd} @ {mmodule}"
 				var r = new SeparateRuntimeFunction(pd)
 				r.compile_to_c(self)
-				if cd.bound_mtype.ctype != "val*" then
+				if true or cd.bound_mtype.ctype != "val*" then
 					var r2 = new VirtualRuntimeFunction(pd)
 					r2.compile_to_c(self)
 				end
@@ -316,7 +349,7 @@ class SeparateCompiler
 	end
 
 	# Globaly compile the type structure of a live type
-	fun compile_type_to_c(mtype: MClassType)
+	fun compile_type_to_c(mtype: MType)
 	do
 		var c_name = mtype.c_name
 		var v = new SeparateCompilerVisitor(self)
@@ -327,21 +360,27 @@ class SeparateCompiler
 		self.header.add_decl("struct type_{c_name} \{")
 		self.header.add_decl("int id;")
 		self.header.add_decl("int color;")
+		self.header.add_decl("int livecolor;")
+		self.header.add_decl("short int is_nullable;")
+		self.header.add_decl("const struct vts_table_{c_name} *vts_table;")
 		self.header.add_decl("const struct fts_table_{c_name} *fts_table;")
+		self.header.add_decl("int table_size;")
 		self.header.add_decl("int type_table[{self.type_tables[mtype].length}];")
 		self.header.add_decl("\};")
 
-		# extern const struct fst_table_X fst_table_X
-		self.header.add_decl("extern const struct fts_table_{c_name} fts_table_{c_name};")
-		self.header.add_decl("struct fts_table_{c_name} \{")
-		self.header.add_decl("struct type *fts[{self.ft_tables[mtype.mclass].length}];")
-		self.header.add_decl("\};")
-
 		# const struct type_X
 		v.add_decl("const struct type_{c_name} type_{c_name} = \{")
 		v.add_decl("{self.typeids[mtype]},")
 		v.add_decl("{self.type_colors[mtype]},")
+		v.add_decl("{self.livetypes_colors[mtype]},")
+		if mtype isa MNullableType then
+			v.add_decl("1,")
+		else
+			v.add_decl("0,")
+		end
+		v.add_decl("&vts_table_{c_name},")
 		v.add_decl("&fts_table_{c_name},")
+		v.add_decl("{self.type_tables[mtype].length},")
 		v.add_decl("\{")
 		for stype in self.type_tables[mtype] do
 			if stype == null then
@@ -353,33 +392,105 @@ class SeparateCompiler
 		v.add_decl("\},")
 		v.add_decl("\};")
 
-		# const struct fst_table_X fst_table_X
-		v.add_decl("const struct fts_table_{c_name} fts_table_{c_name} = \{")
+		compile_type_fts_table(mtype)
+		compile_type_vts_table(mtype)
+	end
+
+	protected fun compile_type_fts_table(mtype: MType) do
+
+		var mclass_type: MClassType
+		if mtype isa MNullableType then
+			mclass_type = mtype.mtype.as(MClassType)
+		else
+			mclass_type = mtype.as(MClassType)
+		end
+
+		# extern const struct fst_table_X fst_table_X
+		self.header.add_decl("extern const struct fts_table_{mtype.c_name} fts_table_{mtype.c_name};")
+		self.header.add_decl("struct fts_table_{mtype.c_name} \{")
+		self.header.add_decl("struct type *fts[{self.ft_tables[mclass_type.mclass].length}];")
+		self.header.add_decl("\};")
+
+		# const struct fts_table_X fts_table_X
+		var v = new_visitor
+		v.add_decl("const struct fts_table_{mtype.c_name} fts_table_{mtype.c_name} = \{")
 		v.add_decl("\{")
+		for ft in self.ft_tables[mclass_type.mclass] do
+			if ft == null then
+				v.add_decl("NULL, /* empty */")
+			else
+				var ntype: MType
+				if ft.mclass == mclass_type.mclass then
+					ntype = mclass_type.arguments[ft.rank]
+				else
+					ntype = ft.anchor_to(self.mainmodule, mclass_type)
+				end
+				if self.typeids.has_key(ntype) then
+					v.add_decl("(struct type*)&type_{ntype.c_name}, /* {ft} ({ntype}) */")
+				else
+					v.add_decl("NULL, /* empty ({ft} not a live type) */")
+				end
+			end
+		end
+		v.add_decl("\},")
+		v.add_decl("\};")
+	end
+
+	protected fun compile_type_vts_table(mtype: MType) do
 
-		if mtype isa MGenericType then
-			for ft in self.ft_tables[mtype.mclass] do
-				if ft == null then
-					v.add_decl("NULL, /* empty */")
+		var mclass_type: MClassType
+		if mtype isa MNullableType then
+			mclass_type = mtype.mtype.as(MClassType)
+		else
+			mclass_type = mtype.as(MClassType)
+		end
+
+		# extern const struct vts_table_X vts_table_X
+		self.header.add_decl("extern const struct vts_table_{mtype.c_name} vts_table_{mtype.c_name};")
+		self.header.add_decl("struct vts_table_{mtype.c_name} \{")
+		self.header.add_decl("struct type *vts[{self.vt_tables[mclass_type.mclass].length}];")
+		self.header.add_decl("\};")
+
+		# const struct vts_table_X vts_table_X
+		var v = new_visitor
+		v.add_decl("const struct vts_table_{mtype.c_name} vts_table_{mtype.c_name} = \{")
+		v.add_decl("\{")
+
+		for vt in self.vt_tables[mclass_type.mclass] do
+			if vt == null then
+				v.add_decl("NULL, /* empty */")
+			else
+				var bound = vt.bound
+				if bound == null then
+					#FIXME how can a bound be null here ?
+					print "No bound found for virtual type {vt} ?"
+					abort
 				else
-					var id = -1
-					var ntype: MType
-					if ft.mclass == mtype.mclass then
-						ntype = mtype.arguments[ft.rank]
+					var is_nullable = ""
+					if bound isa MNullableType then
+						bound = bound.mtype
+						is_nullable = "nullable_"
+					end
+					if bound isa MVirtualType then
+						bound = bound.anchor_to(self.mainmodule, mclass_type)
+					else if bound isa MParameterType then
+						bound = bound.anchor_to(self.mainmodule, mclass_type)
+					else if bound isa MGenericType and bound.need_anchor then
+						bound = bound.anchor_to(self.mainmodule, mclass_type)
+					else if bound isa MClassType then
 					else
-						ntype = ft.anchor_to(self.mainmodule, mtype)
+						print "NOT YET IMPLEMENTED: mtype_to_livetype with type: {bound}"
+						abort
 					end
-					if ntype isa MNullableType then ntype = ntype.mtype
-					var ftype = ntype.as(MClassType)
-					if self.typeids.has_key(ftype) then
-						v.add_decl("(struct type*)&type_{ftype.c_name}, /* {ft} ({ftype}) */")
+
+					if self.typeids.has_key(bound) then
+						v.add_decl("(struct type*)&type_{is_nullable}{bound.c_name}, /* {bound} */")
 					else
-						v.add_decl("NULL, /* empty ({ft} not a live type) */")
+						v.add_decl("NULL, /* dead type {bound} */")
 					end
 				end
 			end
 		end
-
 		v.add_decl("\},")
 		v.add_decl("\};")
 	end
@@ -394,7 +505,7 @@ class SeparateCompiler
 
 		var vft = self.method_tables[mclass]
 		var attrs = self.attr_tables[mclass]
-		var v = new SeparateCompilerVisitor(self)
+		var v = new_visitor
 
 		v.add_decl("/* runtime class {c_name} */")
 		var idnum = classids.length
@@ -403,37 +514,21 @@ class SeparateCompiler
 		#self.header.add_decl("#define {idname} {idnum} /* {c_name} */")
 
 		self.header.add_decl("struct class_{c_name} \{")
+		self.header.add_decl("int box_kind;")
 		self.header.add_decl("nitmethod_t vft[{vft.length}];")
-
-		if mtype.ctype != "val*" then
-			# Is the Nit type is native then the struct is a box with two fields:
-			# * the `vft` to be polymorph
-			# * the `value` that contains the native value.
-			self.header.add_decl("{mtype.ctype} value;")
-		end
-
-		# Collect all attributes and associate them a field in the structure.
-		# Note: we do not try to optimize the order and helps CC to optimize the client code.
-		for cd in mtype.collect_mclassdefs(self.mainmodule) do
-			for p in cd.intro_mproperties do
-				if not p isa MAttribute then continue
-				var t = p.intro.static_mtype.as(not null)
-				t = t.anchor_to(self.mainmodule, mtype)
-				self.header.add_decl("{t.ctype} {p.intro.c_name}; /* {p}: {t} */")
-			end
-		end
 		self.header.add_decl("\};")
 
 		# Build class vft
 		self.header.add_decl("extern const struct class_{c_name} class_{c_name};")
 		v.add_decl("const struct class_{c_name} class_{c_name} = \{")
+		v.add_decl("{self.box_kind_of(mclass)}, /* box_kind */")
 		v.add_decl("\{")
 		for i in [0 .. vft.length[ do
 			var mpropdef = vft[i]
 			if mpropdef == null then
 				v.add_decl("NULL, /* empty */")
 			else
-				if mpropdef.mclassdef.bound_mtype.ctype != "val*" then
+				if true or mpropdef.mclassdef.bound_mtype.ctype != "val*" then
 					v.add_decl("(nitmethod_t)VIRTUAL_{mpropdef.c_name}, /* pointer to {mclass.intro_mmodule}:{mclass}:{mpropdef} */")
 				else
 					v.add_decl("(nitmethod_t){mpropdef.c_name}, /* pointer to {mclass.intro_mmodule}:{mclass}:{mpropdef} */")
@@ -451,11 +546,13 @@ class SeparateCompiler
 			self.header.add_decl("{mtype.ctype} value;")
 			self.header.add_decl("\};")
 
-			self.header.add_decl("val* BOX_{c_name}({mtype.ctype}, struct type*);")
+			if not self.runtime_type_analysis.live_types.has(mtype) then return
+
+			self.header.add_decl("val* BOX_{c_name}({mtype.ctype});")
 			v.add_decl("/* allocate {mtype} */")
-			v.add_decl("val* BOX_{mtype.c_name}({mtype.ctype} value, struct type* type) \{")
+			v.add_decl("val* BOX_{mtype.c_name}({mtype.ctype} value) \{")
 			v.add("struct instance_{c_name}*res = GC_MALLOC(sizeof(struct instance_{c_name}));")
-			v.add("res->type = type;")
+			v.add("res->type = (struct type*) &type_{c_name};")
 			v.add("res->class = (struct class*) &class_{c_name};")
 			v.add("res->value = value;")
 			v.add("return (val*)res;")
@@ -463,35 +560,65 @@ class SeparateCompiler
 			return
 		end
 
+		var is_native_array = mclass.name == "NativeArray"
+
+		var sig
+		if is_native_array then
+			sig = "int length, struct type* type"
+		else
+			sig = "struct type* type"
+		end
+
 		#Build instance struct
-		v.add_decl("struct instance_{c_name} \{")
-		v.add_decl("const struct type *type;")
-		v.add_decl("const struct class *class;")
-		v.add_decl("nitattribute_t attrs[{attrs.length}];")
-		v.add_decl("\};")
+		#extern const struct instance_array__NativeArray instance_array__NativeArray;
+		self.header.add_decl("struct instance_{c_name} \{")
+		self.header.add_decl("const struct type *type;")
+		self.header.add_decl("const struct class *class;")
+		self.header.add_decl("nitattribute_t attrs[{attrs.length}];")
+		if is_native_array then
+			# NativeArrays are just a instance header followed by an array of values
+			self.header.add_decl("val* values[0];")
+		end
+		self.header.add_decl("\};")
 
 
-		self.header.add_decl("{mtype.ctype} NEW_{c_name}(struct type* type);")
+		self.header.add_decl("{mtype.ctype} NEW_{c_name}({sig});")
 		v.add_decl("/* allocate {mtype} */")
-		v.add_decl("{mtype.ctype} NEW_{c_name}(struct type* type) \{")
+		v.add_decl("{mtype.ctype} NEW_{c_name}({sig}) \{")
 		var res = v.new_named_var(mtype, "self")
 		res.is_exact = true
-		v.add("{res} = calloc(sizeof(struct instance_{c_name}), 1);")
+		if is_native_array then
+			var mtype_elt = mtype.arguments.first
+			v.add("{res} = GC_MALLOC(sizeof(struct instance_{c_name}) + length*sizeof({mtype_elt.ctype}));")
+		else
+			v.add("{res} = GC_MALLOC(sizeof(struct instance_{c_name}));")
+		end
+		#v.add("{res} = calloc(sizeof(struct instance_{c_name}), 1);")
 		v.add("{res}->type = type;")
 		v.add("{res}->class = (struct class*) &class_{c_name};")
 
-		for cd in mtype.collect_mclassdefs(self.mainmodule)
-		do
-			var n = self.modelbuilder.mclassdef2nclassdef[cd]
-			for npropdef in n.n_propdefs do
-				if npropdef isa AAttrPropdef then
-					npropdef.init_expr(v, res)
-				end
-			end
-		end
+		self.generate_init_attr(v, res, mtype)
 		v.add("return {res};")
 		v.add("\}")
+
+		generate_check_init_instance(mtype)
 	end
+
+	redef fun generate_check_init_instance(mtype)
+	do
+		if self.modelbuilder.toolcontext.opt_no_check_initialization.value then return
+
+		var v = self.new_visitor
+		var c_name = mtype.mclass.c_name
+		var res = new RuntimeVariable("self", mtype, mtype)
+		self.header.add_decl("void CHECK_NEW_{c_name}({mtype.ctype});")
+		v.add_decl("/* allocate {mtype} */")
+		v.add_decl("void CHECK_NEW_{c_name}({mtype.ctype} {res}) \{")
+		self.generate_check_attr(v, res, mtype)
+		v.add("\}")
+	end
+
+	redef fun new_visitor do return new SeparateCompilerVisitor(self)
 end
 
 # The C function associated to a methoddef separately compiled
@@ -510,17 +637,18 @@ class SeparateRuntimeFunction
 		var mmethoddef = self.mmethoddef
 
 		var recv = self.mmethoddef.mclassdef.bound_mtype
-		var v = new SeparateCompilerVisitor(compiler)
+		var v = compiler.new_visitor
 		var selfvar = new RuntimeVariable("self", recv, recv)
 		var arguments = new Array[RuntimeVariable]
 		var frame = new Frame(v, mmethoddef, recv, arguments)
 		v.frame = frame
 
+		var msignature = mmethoddef.msignature.resolve_for(mmethoddef.mclassdef.bound_mtype, mmethoddef.mclassdef.bound_mtype, mmethoddef.mclassdef.mmodule, true)
+
 		var sig = new Buffer
 		var comment = new Buffer
-		var ret = mmethoddef.msignature.return_mtype
+		var ret = msignature.return_mtype
 		if ret != null then
-			ret = v.resolve_for(ret, selfvar)
 			sig.append("{ret.ctype} ")
 		else if mmethoddef.mproperty.is_new then
 			ret = recv
@@ -532,12 +660,11 @@ class SeparateRuntimeFunction
 		sig.append("({selfvar.mtype.ctype} {selfvar}")
 		comment.append("(self: {selfvar}")
 		arguments.add(selfvar)
-		for i in [0..mmethoddef.msignature.arity[ do
-			var mtype = mmethoddef.msignature.mparameters[i].mtype
-			if i == mmethoddef.msignature.vararg_rank then
+		for i in [0..msignature.arity[ do
+			var mtype = msignature.mparameters[i].mtype
+			if i == msignature.vararg_rank then
 				mtype = v.get_class("Array").get_mtype([mtype])
 			end
-			mtype = v.resolve_for(mtype, selfvar)
 			comment.append(", {mtype}")
 			sig.append(", {mtype.ctype} p{i}")
 			var argvar = new RuntimeVariable("p{i}", mtype, mtype)
@@ -587,7 +714,7 @@ class VirtualRuntimeFunction
 		var mmethoddef = self.mmethoddef
 
 		var recv = self.mmethoddef.mclassdef.bound_mtype
-		var v = new SeparateCompilerVisitor(compiler)
+		var v = compiler.new_visitor
 		var selfvar = new RuntimeVariable("self", v.object_type, recv)
 		var arguments = new Array[RuntimeVariable]
 		var frame = new Frame(v, mmethoddef, recv, arguments)
@@ -661,16 +788,16 @@ class SeparateCompilerVisitor
 
 	redef fun adapt_signature(m: MMethodDef, args: Array[RuntimeVariable])
 	do
+		var msignature = m.msignature.resolve_for(m.mclassdef.bound_mtype, m.mclassdef.bound_mtype, m.mclassdef.mmodule, true)
 		var recv = args.first
 		if recv.mtype.ctype != m.mclassdef.mclass.mclass_type.ctype then
 			args.first = self.autobox(args.first, m.mclassdef.mclass.mclass_type)
 		end
-		for i in [0..m.msignature.arity[ do
-			var t = m.msignature.mparameters[i].mtype
-			if i == m.msignature.vararg_rank then
+		for i in [0..msignature.arity[ do
+			var t = msignature.mparameters[i].mtype
+			if i == msignature.vararg_rank then
 				t = args[i+1].mtype
 			end
-			t = self.resolve_for(t, recv)
 			args[i+1] = self.autobox(args[i+1], t)
 		end
 	end
@@ -679,7 +806,9 @@ class SeparateCompilerVisitor
 	# ENSURE: result.mtype.ctype == mtype.ctype
 	redef fun autobox(value: RuntimeVariable, mtype: MType): RuntimeVariable
 	do
-		if value.mtype.ctype == mtype.ctype then
+		if value.mtype == mtype then
+			return value
+		else if value.mtype.ctype == "val*" and mtype.ctype == "val*" then
 			return value
 		else if value.mtype.ctype == "val*" then
 			return self.new_expr("((struct instance_{mtype.c_name}*){value})->value; /* autounbox from {value.mtype} to {mtype} */", mtype)
@@ -691,9 +820,7 @@ class SeparateCompilerVisitor
 				self.add("printf(\"Dead code executed!\\n\"); exit(1);")
 				return res
 			end
-			var totype = value.mtype
-			if totype isa MNullableType then totype = totype.mtype
-			self.add("{res} = BOX_{valtype.c_name}({value}, (struct type*) &type_{totype.c_name}); /* autobox from {value.mtype} to {mtype} */")
+			self.add("{res} = BOX_{valtype.c_name}({value}); /* autobox from {value.mtype} to {mtype} */")
 			return res
 		else
 			# Bad things will appen!
@@ -706,9 +833,8 @@ class SeparateCompilerVisitor
 
 	redef fun send(mmethod, arguments)
 	do
-		if arguments.first.mtype.ctype != "val*" then
-			assert arguments.first.mtype == arguments.first.mcasttype
-			return self.monomorphic_send(mmethod, arguments.first.mtype, arguments)
+		if arguments.first.mcasttype.ctype != "val*" then
+			return self.monomorphic_send(mmethod, arguments.first.mcasttype, arguments)
 		end
 
 		var res: nullable RuntimeVariable
@@ -720,7 +846,6 @@ class SeparateCompilerVisitor
 		else if ret == null then
 			res = null
 		else
-			ret = self.resolve_for(ret, arguments.first)
 			res = self.new_var(ret)
 		end
 
@@ -730,15 +855,20 @@ class SeparateCompilerVisitor
 		var recv = arguments.first
 		s.append("val*")
 		ss.append("{recv}")
+		self.varargize(msignature, arguments)
 		for i in [0..msignature.arity[ do
 			var a = arguments[i+1]
 			var t = msignature.mparameters[i].mtype
+			if i == msignature.vararg_rank then
+				t = arguments[i+1].mcasttype
+			end
 			s.append(", {t.ctype}")
 			a = self.autobox(a, t)
 			ss.append(", {a}")
 		end
 
-		var maybenull = recv.mcasttype isa MNullableType
+		var consider_null = not self.compiler.modelbuilder.toolcontext.opt_no_check_other.value or mmethod.name == "==" or mmethod.name == "!="
+		var maybenull = recv.mcasttype isa MNullableType and consider_null
 		if maybenull then
 			self.add("if ({recv} == NULL) \{")
 			if mmethod.name == "==" then
@@ -767,10 +897,9 @@ class SeparateCompilerVisitor
 			self.add("\} else \{")
 		end
 
-		var color = self.compiler.as(SeparateCompiler).method_colors[mmethod]
 		var r
 		if ret == null then r = "void" else r = ret.ctype
-		var call = "(({r} (*)({s}))({arguments.first}->class->vft[{color}]))({ss}) /* {mmethod} on {arguments.first.inspect}*/"
+		var call = "(({r} (*)({s}))({arguments.first}->class->vft[{mmethod.const_color}]))({ss}) /* {mmethod} on {arguments.first.inspect}*/"
 
 		if res != null then
 			self.add("{res} = {call};")
@@ -795,10 +924,26 @@ class SeparateCompilerVisitor
 		else if ret == null then
 			res = null
 		else
-			ret = self.resolve_for(ret, arguments.first)
+			ret = ret.resolve_for(mmethoddef.mclassdef.bound_mtype, mmethoddef.mclassdef.bound_mtype, mmethoddef.mclassdef.mmodule, true)
 			res = self.new_var(ret)
 		end
 
+		if self.compiler.modelbuilder.mpropdef2npropdef.has_key(mmethoddef) and
+		self.compiler.modelbuilder.mpropdef2npropdef[mmethoddef] isa AInternMethPropdef and
+		not compiler.modelbuilder.toolcontext.opt_no_inline_intern.value then
+			var frame = new Frame(self, mmethoddef, recvtype, arguments)
+			frame.returnlabel = self.get_name("RET_LABEL")
+			frame.returnvar = res
+			var old_frame = self.frame
+			self.frame = frame
+			self.add("\{ /* Inline {mmethoddef} ({arguments.join(",")}) */")
+			mmethoddef.compile_inside_to_c(self, arguments)
+			self.add("{frame.returnlabel.as(not null)}:(void)0;")
+			self.add("\}")
+			self.frame = old_frame
+			return res
+		end
+
 		# Autobox arguments
 		self.adapt_signature(mmethoddef, arguments)
 
@@ -814,35 +959,96 @@ class SeparateCompilerVisitor
 
 	redef fun isset_attribute(a, recv)
 	do
-		# FIXME: Here we inconditionally return boxed primitive attributes
+		self.check_recv_notnull(recv)
 		var res = self.new_var(bool_type)
-		self.add("{res} = {recv}->attrs[{self.compiler.as(SeparateCompiler).attr_colors[a]}] != NULL; /* {a} on {recv.inspect}*/")
+		self.add("{res} = {recv}->attrs[{a.const_color}] != NULL; /* {a} on {recv.inspect}*/")
 		return res
 	end
 
 	redef fun read_attribute(a, recv)
 	do
-		# FIXME: Here we inconditionally return boxed primitive attributes
+		self.check_recv_notnull(recv)
+
+		# What is the declared type of the attribute?
 		var ret = a.intro.static_mtype.as(not null)
-		ret = self.resolve_for(ret, recv)
+		var intromclassdef = a.intro.mclassdef
+		ret = ret.resolve_for(intromclassdef.bound_mtype, intromclassdef.bound_mtype, intromclassdef.mmodule, true)
+
+		# Get the attribute or a box (ie. always a val*)
 		var cret = self.object_type.as_nullable
 		var res = self.new_var(cret)
 		res.mcasttype = ret
-		self.add("{res} = {recv}->attrs[{self.compiler.as(SeparateCompiler).attr_colors[a]}]; /* {a} on {recv.inspect} */")
-		if not ret isa MNullableType then
+		self.add("{res} = {recv}->attrs[{a.const_color}]; /* {a} on {recv.inspect} */")
+
+		# Check for Uninitialized attribute
+		if not ret isa MNullableType and not self.compiler.modelbuilder.toolcontext.opt_no_check_initialization.value then
 			self.add("if ({res} == NULL) \{")
 			self.add_abort("Uninitialized attribute {a.name}")
 			self.add("\}")
 		end
 
-		return res
+		# Return the attribute or its unboxed version
+		# Note: it is mandatory since we reuse the box on write, we do not whant that the box escapes
+		return self.autobox(res, ret)
 	end
 
 	redef fun write_attribute(a, recv, value)
 	do
-		# FIXME: Here we inconditionally box primitive attributes
-		value = self.autobox(value, self.object_type.as_nullable)
-		self.add("{recv}->attrs[{self.compiler.as(SeparateCompiler).attr_colors[a]}] = {value}; /* {a} on {recv.inspect} */")
+		self.check_recv_notnull(recv)
+
+		# What is the declared type of the attribute?
+		var mtype = a.intro.static_mtype.as(not null)
+		var intromclassdef = a.intro.mclassdef
+		mtype = mtype.resolve_for(intromclassdef.bound_mtype, intromclassdef.bound_mtype, intromclassdef.mmodule, true)
+
+		# Adapt the value to the declared type
+		value = self.autobox(value, mtype)
+		var attr = "{recv}->attrs[{a.const_color}]"
+		if mtype.ctype != "val*" then
+			assert mtype isa MClassType
+			# The attribute is primitive, thus we store it in a box
+			# The trick is to create the box the first time then resuse the box
+			self.add("if ({attr} != NULL) \{")
+			self.add("((struct instance_{mtype.c_name}*){attr})->value = {value}; /* {a} on {recv.inspect} */")
+			self.add("\} else \{")
+			value = self.autobox(value, self.object_type.as_nullable)
+			self.add("{attr} = {value}; /* {a} on {recv.inspect} */")
+			self.add("\}")
+		else
+			# The attribute is not primitive, thus store it direclty
+			self.add("{attr} = {value}; /* {a} on {recv.inspect} */")
+		end
+	end
+
+	# Build livetype structure retrieving
+	#ENSURE: mtype.need_anchor
+	fun retrieve_anchored_livetype(mtype: MGenericType, buffer: Buffer) do
+		assert mtype.need_anchor
+
+		var compiler = self.compiler.as(SeparateCompiler)
+		for ft in mtype.arguments do
+
+			var ntype = ft
+			var s: String = ""
+			if ntype isa MNullableType then
+				ntype = ntype.mtype
+			end
+
+			if ntype isa MParameterType then
+				buffer.append("[self->type->fts_table->fts[{ntype.const_color}]->livecolor]")
+			else if ntype isa MVirtualType then
+				buffer.append("[self->type->vts_table->vts[{ntype.mproperty.const_color}]->livecolor]")
+			else if ntype isa MGenericType and ntype.need_anchor then
+				var bbuff = new Buffer
+				retrieve_anchored_livetype(ntype, bbuff)
+				buffer.append("[livetypes_{ntype.mclass.c_name}{bbuff.to_s}->livecolor]")
+			else if ntype isa MClassType then
+				compiler.undead_types.add(ft)
+				buffer.append("[type_{ft.c_name}.livecolor]")
+			else
+				self.add("printf(\"NOT YET IMPLEMENTED: init_instance(%s, {mtype}).\\n\", \"{ft}\"); exit(1);")
+			end
+		end
 	end
 
 	redef fun init_instance(mtype)
@@ -850,10 +1056,7 @@ class SeparateCompilerVisitor
 		var compiler = self.compiler.as(SeparateCompiler)
 		if mtype isa MGenericType and mtype.need_anchor then
 			var buff = new Buffer
-			for ft in mtype.mclass.mclass_type.arguments do
-				var ftcolor = compiler.ft_colors[ft.as(MParameterType)]
-				buff.append("[self->type->fts_table->fts[{ftcolor}]->id]")
-			end
+			retrieve_anchored_livetype(mtype, buff)
 			mtype = self.anchor(mtype).as(MClassType)
 			return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) livetypes_{mtype.mclass.c_name}{buff.to_s})", mtype)
 		end
@@ -861,44 +1064,108 @@ class SeparateCompilerVisitor
 		return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) &type_{mtype.c_name})", mtype)
 	end
 
+	redef fun check_init_instance(value, mtype)
+	do
+		if self.compiler.modelbuilder.toolcontext.opt_no_check_initialization.value then return
+		self.add("CHECK_NEW_{mtype.mclass.c_name}({value});")
+	end
+
+
 	redef fun type_test(value, mtype)
 	do
 		var compiler = self.compiler.as(SeparateCompiler)
+
+		var recv = self.frame.arguments.first
+		var recv_boxed = self.autobox(recv, self.object_type)
+
 		var res = self.new_var(bool_type)
-		var buff = new Buffer
 
-		if mtype isa MNullableType then mtype = mtype.mtype
-		if mtype isa MGenericType and mtype.need_anchor then
-			for ft in mtype.mclass.mclass_type.arguments do
-				var ftcolor = compiler.ft_colors[ft.as(MParameterType)]
-				buff.append("[self->type->fts_table->fts[{ftcolor}]->id]")
-			end
-			self.add("{res} = {value}->type->type_table[livetypes_{mtype.mclass.c_name}{buff.to_s}->color] == livetypes_{mtype.mclass.c_name}{buff.to_s}->id;")
-		else if mtype isa MClassType then
+		var cltype = self.get_name("cltype")
+		self.add_decl("int {cltype};")
+		var idtype = self.get_name("idtype")
+		self.add_decl("int {idtype};")
+
+		var is_nullable = self.get_name("is_nullable")
+		self.add_decl("short int {is_nullable};")
+
+		var boxed = self.autobox(value, self.object_type)
+
+		var ntype = mtype
+		if ntype isa MNullableType then
+			ntype = ntype.mtype
+		end
+
+		if ntype isa MParameterType then
+			self.add("{cltype} = {recv_boxed}->type->fts_table->fts[{ntype.const_color}]->color;")
+			self.add("{idtype} = {recv_boxed}->type->fts_table->fts[{ntype.const_color}]->id;")
+			self.add("{is_nullable} = {recv_boxed}->type->fts_table->fts[{ntype.const_color}]->is_nullable;")
+		else if ntype isa MGenericType and ntype.need_anchor then
+			var buff = new Buffer
+			retrieve_anchored_livetype(ntype, buff)
+			self.add("{cltype} = livetypes_{ntype.mclass.c_name}{buff.to_s}->color;")
+			self.add("{idtype} = livetypes_{ntype.mclass.c_name}{buff.to_s}->id;")
+			self.add("{is_nullable} = livetypes_{ntype.mclass.c_name}{buff.to_s}->is_nullable;")
+		else if ntype isa MClassType then
 			compiler.undead_types.add(mtype)
-			self.add("{res} = {value}->type->type_table[type_{mtype.c_name}.color] == type_{mtype.c_name}.id;")
-		else if mtype isa MParameterType then
-			var ftcolor = compiler.ft_colors[mtype]
-			self.add("{res} = {value}->type->type_table[self->type->fts_table->fts[{ftcolor}]->color] == self->type->fts_table->fts[{ftcolor}]->id;")
+			self.add("{cltype} = type_{mtype.c_name}.color;")
+			self.add("{idtype} = type_{mtype.c_name}.id;")
+			self.add("{is_nullable} = type_{mtype.c_name}.is_nullable;")
+		else if ntype isa MVirtualType then
+			var vtcolor = ntype.mproperty.const_color
+			self.add("{cltype} = {recv_boxed}->type->vts_table->vts[{vtcolor}]->color;")
+			self.add("{idtype} = {recv_boxed}->type->vts_table->vts[{vtcolor}]->id;")
+			self.add("{is_nullable} = {recv_boxed}->type->vts_table->vts[{vtcolor}]->is_nullable;")
+		else
+			self.add("printf(\"NOT YET IMPLEMENTED: type_test(%s, {mtype}).\\n\", \"{boxed.inspect}\"); exit(1);")
 		end
 
+		if mtype isa MNullableType then
+			self.add("{is_nullable} = 1;")
+		end
+
+		# check color is in table
+		self.add("if({boxed} == NULL) \{")
+		self.add("{res} = {is_nullable};")
+		self.add("\} else \{")
+		self.add("if({cltype} >= {boxed}->type->table_size) \{")
+		self.add("{res} = 0;")
+		self.add("\} else \{")
+		self.add("{res} = {boxed}->type->type_table[{cltype}] == {idtype};")
+		self.add("\}")
+		self.add("\}")
+
 		return res
 	end
 
 	redef fun is_same_type_test(value1, value2)
 	do
 		var res = self.new_var(bool_type)
-		# TODO
-		add("printf(\"NOT YET IMPLEMENTED: is_same_type(%s,%s).\\n\", \"{value1.inspect}\", \"{value2.inspect}\"); exit(1);")
+		# Swap values to be symetric
+		if value2.mtype.ctype != "val*" and value1.mtype.ctype == "val*" then
+			var tmp = value1
+			value1 = value2
+			value2 = tmp
+		end
+		if value1.mtype.ctype != "val*" then
+			if value2.mtype == value1.mtype then
+				self.add("{res} = 1; /* is_same_type_test: compatible types {value1.mtype} vs. {value2.mtype} */")
+			else if value2.mtype.ctype != "val*" then
+				self.add("{res} = 0; /* is_same_type_test: incompatible types {value1.mtype} vs. {value2.mtype}*/")
+			else
+				var mtype1 = value1.mtype.as(MClassType)
+				self.add("{res} = ({value2} != NULL) && ({value2}->class == (struct class*) &class_{mtype1.c_name}); /* is_same_type_test */")
+			end
+		else
+			self.add("{res} = ({value1} == {value2}) || ({value1} != NULL && {value2} != NULL && {value1}->class == {value2}->class); /* is_same_type_test */")
+		end
 		return res
 	end
 
-	redef fun class_name_string(value1)
+	redef fun class_name_string(value)
 	do
 		var res = self.get_name("var_class_name")
-		self.add_decl("const char* {res};")
-		# TODO
-		add("printf(\"NOT YET IMPLEMENTED: class_name_string(%s).\\n\", \"{value1.inspect}\"); exit(1);")
+		self.add_decl("const char *{res};")
+		self.add("{res} = class_names[{value}->type->id];")
 		return res
 	end
 
@@ -911,7 +1178,7 @@ class SeparateCompilerVisitor
 			value2 = tmp
 		end
 		if value1.mtype.ctype != "val*" then
-			if value2.mtype.ctype == value1.mtype.ctype then
+			if value2.mtype == value1.mtype then
 				self.add("{res} = {value1} == {value2};")
 			else if value2.mtype.ctype != "val*" then
 				self.add("{res} = 0; /* incompatible types {value1.mtype} vs. {value2.mtype}*/")
@@ -922,11 +1189,151 @@ class SeparateCompilerVisitor
 				self.add("{res} = ({self.autobox(value2, value1.mtype)} == {value1});")
 				self.add("\}")
 			end
+			return res
+		end
+		var maybe_null = true
+		var test = new Array[String]
+		var t1 = value1.mcasttype
+		if t1 isa MNullableType then
+			test.add("{value1} != NULL")
+			t1 = t1.mtype
+		else
+			maybe_null = false
+		end
+		var t2 = value2.mcasttype
+		if t2 isa MNullableType then
+			test.add("{value2} != NULL")
+			t2 = t2.mtype
+		else
+			maybe_null = false
+		end
+
+		var incompatible = false
+		var primitive
+		if t1.ctype != "val*" then
+			primitive = t1
+			if t1 == t2 then
+				# No need to compare class
+			else if t2.ctype != "val*" then
+				incompatible = true
+			else if can_be_primitive(value2) then
+				test.add("{value1}->class == {value2}->class")
+			else
+				incompatible = true
+			end
+		else if t2.ctype != "val*" then
+			primitive = t2
+			if can_be_primitive(value1) then
+				test.add("{value1}->class == {value2}->class")
+			else
+				incompatible = true
+			end
+		else
+			primitive = null
+		end
+
+		if incompatible then
+			if maybe_null then
+				self.add("{res} = {value1} == {value2}; /* incompatible types {t1} vs. {t2}; but may be NULL*/")
+				return res
+			else
+				self.add("{res} = 0; /* incompatible types {t1} vs. {t2}; cannot be NULL */")
+				return res
+			end
+		end
+		if primitive != null then
+			test.add("((struct instance_{primitive.c_name}*){value1})->value == ((struct instance_{primitive.c_name}*){value2})->value")
+		else if can_be_primitive(value1) and can_be_primitive(value2) then
+			test.add("{value1}->class == {value2}->class")
+			var s = new Array[String]
+			for t, v in self.compiler.as(SeparateCompiler).box_kinds do
+				s.add "({value1}->class->box_kind == {v} && ((struct instance_{t.c_name}*){value1})->value == ((struct instance_{t.c_name}*){value2})->value)"
+			end
+			test.add("({s.join(" || ")})")
 		else
 			self.add("{res} = {value1} == {value2};")
+			return res
 		end
+		self.add("{res} = {value1} == {value2} || ({test.join(" && ")});")
 		return res
 	end
+
+	fun can_be_primitive(value: RuntimeVariable): Bool
+	do
+		var t = value.mcasttype
+		if t isa MNullableType then t = t.mtype
+		if not t isa MClassType then return false
+		var k = t.mclass.kind
+		return k == interface_kind or t.ctype != "val*"
+	end
+
+	fun maybe_null(value: RuntimeVariable): Bool
+	do
+		var t = value.mcasttype
+		return t isa MNullableType or t isa MNullType
+	end
+
+	redef fun array_instance(array, elttype)
+	do
+		var nclass = self.get_class("NativeArray")
+		var arrayclass = self.get_class("Array")
+		var arraytype = arrayclass.get_mtype([elttype])
+		var res = self.init_instance(arraytype)
+		self.add("\{ /* {res} = array_instance Array[{elttype}] */")
+		var length = self.int_instance(array.length)
+		var nat = native_array_instance(elttype, length)
+		for i in [0..array.length[ do
+			var r = self.autobox(array[i], self.object_type)
+			self.add("((struct instance_{nclass.c_name}*){nat})->values[{i}] = (val*) {r};")
+		end
+		self.send(self.get_property("with_native", arrayclass.intro.bound_mtype), [res, nat, length])
+		self.check_init_instance(res, arraytype)
+		self.add("\}")
+		return res
+	end
+
+	fun native_array_instance(elttype: MType, length: RuntimeVariable): RuntimeVariable
+	do
+		var mtype = self.get_class("NativeArray").get_mtype([elttype])
+		assert mtype isa MGenericType
+		var compiler = self.compiler.as(SeparateCompiler)
+		if mtype.need_anchor then
+			var buff = new Buffer
+			retrieve_anchored_livetype(mtype, buff)
+			mtype = self.anchor(mtype).as(MClassType)
+			return self.new_expr("NEW_{mtype.mclass.c_name}({length}, (struct type *) livetypes_{mtype.mclass.c_name}{buff.to_s})", mtype)
+		end
+		compiler.undead_types.add(mtype)
+		return self.new_expr("NEW_{mtype.mclass.c_name}({length}, (struct type *) &type_{mtype.c_name})", mtype)
+	end
+
+	redef fun native_array_def(pname, ret_type, arguments)
+	do
+		var elttype = arguments.first.mtype
+		var nclass = self.get_class("NativeArray")
+		var recv = "((struct instance_{nclass.c_name}*){arguments[0]})->values"
+		if pname == "[]" then
+			self.ret(self.new_expr("{recv}[{arguments[1]}]", ret_type.as(not null)))
+			return
+		else if pname == "[]=" then
+			self.add("{recv}[{arguments[1]}]={arguments[2]};")
+			return
+		else if pname == "copy_to" then
+			var recv1 = "((struct instance_{nclass.c_name}*){arguments[1]})->values"
+			self.add("memcpy({recv1}, {recv}, {arguments[2]}*sizeof({elttype.ctype}));")
+			return
+		end
+	end
+
+	redef fun calloc_array(ret_type, arguments)
+	do
+		var ret = ret_type.as(MGenericType)
+		var compiler = self.compiler.as(SeparateCompiler)
+		compiler.undead_types.add(ret)
+		var mclass = self.get_class("ArrayCapable")
+		var ft = mclass.mclass_type.arguments.first.as(MParameterType)
+		self.ret(self.new_expr("NEW_{ret.mclass.c_name}({arguments[1]}, (struct type*) livetypes_array__NativeArray[self->type->fts_table->fts[{ft.const_color}]->livecolor])", ret_type))
+	end
 end
 
 redef class MClass
@@ -940,3 +1347,42 @@ redef class MClass
 	end
 	private var c_name_cache: nullable String
 end
+
+redef class MType
+	fun const_color: String do return "COLOR_{c_name}"
+end
+
+redef class MParameterType
+	redef fun c_name
+	do
+		var res = self.c_name_cache
+		if res != null then return res
+		res = "{self.mclass.c_name}_FT{self.rank}"
+		self.c_name_cache = res
+		return res
+	end
+end
+
+redef class MNullableType
+	redef fun c_name
+	do
+		var res = self.c_name_cache
+		if res != null then return res
+		res = "nullable_{self.mtype.c_name}"
+		self.c_name_cache = res
+		return res
+	end
+end
+
+redef class MProperty
+	fun c_name: String do
+		var res = self.c_name_cache
+		if res != null then return res
+		res = "{self.intro.c_name}"
+		self.c_name_cache = res
+		return res
+	end
+	private var c_name_cache: nullable String
+
+	fun const_color: String do return "COLOR_{c_name}"
+end