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

diff --git a/src/compiler/global_compiler.nit b/src/compiler/global_compiler.nit
index edc3c80..a01e362 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
-
-# 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
+		modelbuilder.toolcontext.info("Total methods to compile to C: {compiler.seen.length}", 2)
 
-	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
 
 	# Compile class names (for the class_name and output_class_name methods)
@@ -305,7 +312,7 @@ class GlobalCompilerVisitor
 			var res = self.new_var(mtype)
 			if not compiler.runtime_type_analysis.live_types.has(valtype) then
 				self.add("/*no autobox from {value.mtype} to {mtype}: {value.mtype} is not live! */")
-				self.add("PRINT_ERROR(\"Dead code executed!\\n\"); show_backtrace(1);")
+				self.add("PRINT_ERROR(\"Dead code executed!\\n\"); fatal_exit(1);")
 				return res
 			end
 			self.add("{res} = BOX_{valtype.c_name}({value}); /* autobox from {value.mtype} to {mtype} */")
@@ -316,7 +323,7 @@ class GlobalCompilerVisitor
 			# Bad things will appen!
 			var res = self.new_var(mtype)
 			self.add("/* {res} left unintialized (cannot convert {value.mtype} to {mtype}) */")
-			self.add("PRINT_ERROR(\"Cast error: Cannot cast %s to %s.\\n\", \"{value.mtype}\", \"{mtype}\"); show_backtrace(1);")
+			self.add("PRINT_ERROR(\"Cast error: Cannot cast %s to %s.\\n\", \"{value.mtype}\", \"{mtype}\"); fatal_exit(1);")
 			return res
 		end
 	end
@@ -342,7 +349,7 @@ class GlobalCompilerVisitor
 		var res = self.new_var(mtype)
 		if not compiler.runtime_type_analysis.live_types.has(value.mtype.as(MClassType)) then
 			self.add("/*no boxing of {value.mtype}: {value.mtype} is not live! */")
-			self.add("PRINT_ERROR(\"Dead code executed!\\n\"); show_backtrace(1);")
+			self.add("PRINT_ERROR(\"Dead code executed!\\n\"); fatal_exit(1);")
 			return res
 		end
 		self.add("{res} = BOX_{valtype.c_name}({value}); /* boxing {value.mtype} */")
@@ -434,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);")
@@ -623,7 +630,7 @@ class GlobalCompilerVisitor
 	do
 		if recv.mtype.ctype != "val*" then return
 		self.add("PRINT_ERROR(\"BTD BUG: Dynamic type is %s, static type is %s\\n\", class_names[{recv}->classid], \"{recv.mcasttype}\");")
-		self.add("show_backtrace(1);")
+		self.add("fatal_exit(1);")
 	end
 
 	redef fun isset_attribute(a, recv)