From 049a64496a2d424932f3578a59d8a96d530cec61 Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Wed, 15 Oct 2014 10:39:18 -0400
Subject: [PATCH] global_compiler: remove useless methods since varargisation
 is done at the AST level

Signed-off-by: Jean Privat <jean@pryen.org>
---
 src/compiler/global_compiler.nit |   41 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/src/compiler/global_compiler.nit b/src/compiler/global_compiler.nit
index 4a4cbda..7652368 100644
--- a/src/compiler/global_compiler.nit
+++ b/src/compiler/global_compiler.nit
@@ -520,44 +520,21 @@ class GlobalCompilerVisitor
 		return recvtype
 	end
 
-	# Subpart of old call function
-	# Gets the receiver boxed and casted if necessary
-	private fun get_recv(recvtype: MClassType, args: Array[RuntimeVariable]): RuntimeVariable
+	redef fun call(m, recvtype, args)
 	do
-		return self.autoadapt(self.autobox(args.first, recvtype), recvtype)
-	end
+		var recv_type = get_recvtype(m, recvtype, args)
+		var recv = self.autoadapt(self.autobox(args.first, recvtype), recvtype)
+		if m.is_extern then recv = unbox_extern(recv, recv_type)
+
+		args = args.to_a
+		args.first = recv
 
-	# Finalizes a call to a method ´m´ on type ´recvtype´ with arguments ´args´
-	private fun finalize_call(m: MMethodDef, recvtype: MClassType, args: Array[RuntimeVariable]): nullable RuntimeVariable
-	do
 		assert args.length == m.msignature.arity + 1 else debug("Invalid arity for {m}. {args.length} arguments given.")
 
 		var rm = new CustomizedRuntimeFunction(m, recvtype)
 		return rm.call(self, args)
 	end
 
-	redef fun call(m, recvtype, args)
-	do
-		var recv_type = get_recvtype(m, recvtype, args)
-		var recv = get_recv(recv_type, args)
-		if m.is_extern then recv = unbox_extern(recv, recv_type)
-		var new_args = args.to_a
-		new_args.first = recv
-		return finalize_call(m, recv_type, new_args)
-	end
-
-	# Does a call without encapsulating varargs into an array
-	# Avoids multiple encapsulation when calling a super in a variadic function
-	fun call_without_varargize(m: MMethodDef, recvtype: MClassType, args: Array[RuntimeVariable]): nullable RuntimeVariable
-	do
-		var recv_type = get_recvtype(m, recvtype, args)
-		var recv = get_recv(recv_type, args)
-		if m.is_extern then recv = unbox_extern(recv, recv_type)
-		var new_args = args.to_a
-		new_args.first = recv
-		return finalize_call(m, recv_type, new_args)
-	end
-
 	redef fun supercall(m: MMethodDef, recvtype: MClassType, args: Array[RuntimeVariable]): nullable RuntimeVariable
 	do
 		var types = self.collect_types(args.first)
@@ -579,7 +556,7 @@ class GlobalCompilerVisitor
 				return res
 			end
 			var propdef = m.lookup_next_definition(self.compiler.mainmodule, mclasstype)
-			var res2 = self.call_without_varargize(propdef, mclasstype, args)
+			var res2 = self.call(propdef, mclasstype, args)
 			if res != null then self.assign(res, res2.as(not null))
 			return res
 		end
@@ -601,7 +578,7 @@ class GlobalCompilerVisitor
 			else
 				self.add("case {self.compiler.classid(t)}: /* test {t} */")
 			end
-			var res2 = self.call_without_varargize(propdef, t, args)
+			var res2 = self.call(propdef, t, args)
 			if res != null then self.assign(res, res2.as(not null))
 			self.add "break;"
 		end
-- 
1.7.9.5