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

diff --git a/src/compiler/global_compiler.nit b/src/compiler/global_compiler.nit
index 113b549..7a0f162 100644
--- a/src/compiler/global_compiler.nit
+++ b/src/compiler/global_compiler.nit
@@ -59,6 +59,43 @@ redef class ModelBuilder
 		self.toolcontext.info("*** GENERATING C ***", 1)
 
 		var compiler = new GlobalCompiler(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
+end
+
+# Compiler that use global compilation and perform hard optimisations like:
+#   * customization
+#   * switch dispatch
+#   * inlining
+class GlobalCompiler
+	super AbstractCompiler
+
+	redef type VISITOR: GlobalCompilerVisitor
+
+	# The result of the RTA (used to know live types and methods)
+	var runtime_type_analysis: RapidTypeAnalysis
+
+	init
+	do
+		var file = new_file("{mainmodule.c_name}.nitgg")
+		self.header = new CodeWriter(file)
+		self.live_primitive_types = new Array[MClassType]
+		for t in runtime_type_analysis.live_types do
+			if t.ctype != "val*" or t.mclass.name == "Pointer" then
+				self.live_primitive_types.add(t)
+			end
+		end
+	end
+
+	redef fun do_compilation
+	do
+		var compiler = self
+
 		compiler.compile_header
 
 		if mainmodule.model.get_mclasses_by_name("Pointer") != null then
@@ -89,41 +126,11 @@ redef class ModelBuilder
 		# Compile until all runtime_functions are visited
 		while not compiler.todos.is_empty do
 			var m = compiler.todos.shift
-			self.toolcontext.info("Compile {m} ({compiler.seen.length-compiler.todos.length}/{compiler.seen.length})", 3)
+			modelbuilder.toolcontext.info("Compile {m} ({compiler.seen.length-compiler.todos.length}/{compiler.seen.length})", 3)
 			m.compile_to_c(compiler)
 		end
-		self.toolcontext.info("Total methods to compile to C: {compiler.seen.length}", 2)
-
-		compiler.display_stats
-
-		var time1 = get_time
-		self.toolcontext.info("*** END GENERATING C: {time1-time0} ***", 2)
-		write_and_make(compiler)
-	end
-end
+		modelbuilder.toolcontext.info("Total methods to compile to C: {compiler.seen.length}", 2)
 
-# Compiler that use global compilation and perform hard optimisations like:
-#   * customization
-#   * switch dispatch
-#   * inlining
-class GlobalCompiler
-	super AbstractCompiler
-
-	redef type VISITOR: GlobalCompilerVisitor
-
-	# The result of the RTA (used to know live types and methods)
-	var runtime_type_analysis: RapidTypeAnalysis
-
-	init
-	do
-		var file = new_file("{mainmodule.name}.nitgg")
-		self.header = new CodeWriter(file)
-		self.live_primitive_types = new Array[MClassType]
-		for t in runtime_type_analysis.live_types do
-			if t.ctype != "val*" or t.mclass.name == "Pointer" then
-				self.live_primitive_types.add(t)
-			end
-		end
 	end
 
 	# Compile class names (for the class_name and output_class_name methods)
@@ -396,6 +403,7 @@ class GlobalCompilerVisitor
 	redef fun native_array_instance(elttype: MType, length: RuntimeVariable): RuntimeVariable
 	do
 		var ret_type = self.get_class("NativeArray").get_mtype([elttype])
+		ret_type = anchor(ret_type).as(MClassType)
 		return self.new_expr("NEW_{ret_type.c_name}({length})", ret_type)
 	end
 
@@ -433,7 +441,7 @@ class GlobalCompilerVisitor
 		if args.first.mcasttype isa MNullableType or args.first.mcasttype isa MNullType and consider_null then
 			# The reciever is potentially null, so we have to 3 cases: ==, != or NullPointerException
 			self.add("if ({args.first} == NULL) \{ /* Special null case */")
-			if m.name == "==" then
+			if m.name == "==" or m.name == "is_same_instance" then
 				assert res != null
 				if args[1].mcasttype isa MNullableType then
 					self.add("{res} = ({args[1]} == NULL);")
@@ -964,7 +972,7 @@ private class CustomizedRuntimeFunction
 			selfvar.is_exact = true
 		end
 		var arguments = new Array[RuntimeVariable]
-		var frame = new Frame(v, mmethoddef, recv, arguments)
+		var frame = new StaticFrame(v, mmethoddef, recv, arguments)
 		v.frame = frame
 
 		var sig = new FlatBuffer
@@ -1023,7 +1031,7 @@ private class CustomizedRuntimeFunction
 			ret = v.resolve_for(ret, arguments.first)
 		end
 		if self.mmethoddef.can_inline(v) then
-			var frame = new Frame(v, self.mmethoddef, self.recv, arguments)
+			var frame = new StaticFrame(v, self.mmethoddef, self.recv, arguments)
 			frame.returnlabel = v.get_name("RET_LABEL")
 			if ret != null then
 				frame.returnvar = v.new_var(ret)