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

diff --git a/src/compiler/global_compiler.nit b/src/compiler/global_compiler.nit
index 0b42b7b..a01e362 100644
--- a/src/compiler/global_compiler.nit
+++ b/src/compiler/global_compiler.nit
@@ -312,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} */")
@@ -323,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
@@ -349,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} */")
@@ -441,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);")
@@ -630,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)
@@ -972,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
@@ -1031,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)