From 740d790bf3cfa36d73c1719c587b502f2cafe93d Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Tue, 24 Feb 2015 05:11:34 +0700
Subject: [PATCH] sepcomp: move out opt_substitute_monomorph from
 compile_module_to_c

Signed-off-by: Jean Privat <jean@pryen.org>
---
 src/compiler/separate_compiler.nit |   72 +++++++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/compiler/separate_compiler.nit b/src/compiler/separate_compiler.nit
index 9010227..9273c45 100644
--- a/src/compiler/separate_compiler.nit
+++ b/src/compiler/separate_compiler.nit
@@ -171,6 +171,7 @@ class SeparateCompiler
 		compiler.compile_nitni_global_ref_functions
 		compiler.compile_main_function
 		compiler.compile_finalizer_function
+		compiler.link_mmethods
 
 		# compile methods
 		for m in mainmodule.in_importation.greaters do
@@ -580,30 +581,65 @@ class SeparateCompiler
 				# Generate trampolines
 				if modelbuilder.toolcontext.opt_trampoline_call.value then
 					r2.compile_trampolines(self)
-
-					# Replace monomorphic call to a trampoline by a direct call to the virtual implementation
-					if modelbuilder.toolcontext.opt_substitute_monomorph.value then do
-						var m = pd.mproperty
-						if rta == null then
-							# Without RTA, monomorphic means alone (uniq name)
-							if m.mpropdefs.length != 1 then break label
-						else
-							# With RTA, monomorphic means only live methoddef
-							if not rta.live_methoddefs.has(pd) then break label
-							for md in m.mpropdefs do
-								if md != pd and rta.live_methoddefs.has(md) then break label
-							end
-						end
-						# Here the trick, GNU ld can substitute symbols with specific values.
-						var n2 = "CALL_" + m.const_color
-						linker_script.add("{n2} = {r2.c_name};")
-					end label
 				end
 			end
 		end
 		self.mainmodule = old_module
 	end
 
+	# Process all introduced methods and compile some linking information (if needed)
+	fun link_mmethods
+	do
+		if not modelbuilder.toolcontext.opt_substitute_monomorph.value then return
+
+		for mmodule in mainmodule.in_importation.greaters do
+			for cd in mmodule.mclassdefs do
+				for m in cd.intro_mproperties do
+					if not m isa MMethod then continue
+					link_mmethod(m)
+				end
+			end
+		end
+	end
+
+	# Compile some linking information (if needed)
+	fun link_mmethod(m: MMethod)
+	do
+		var n2 = "CALL_" + m.const_color
+
+		# Replace monomorphic call by a direct call to the virtual implementation
+		var md = is_monomorphic(m)
+		if md != null then
+			linker_script.add("{n2} = {md.virtual_runtime_function.c_name};")
+		end
+
+	end
+
+	# The single mmethodef called in case of monomorphism.
+	# Returns nul if dead or polymorphic.
+	fun is_monomorphic(m: MMethod): nullable MMethodDef
+	do
+		var rta = runtime_type_analysis
+		if rta == null then
+			# Without RTA, monomorphic means alone (uniq name)
+			if m.mpropdefs.length == 1 then
+				return m.mpropdefs.first
+			else
+				return null
+			end
+		else
+			# With RTA, monomorphic means only live methoddef
+			var res: nullable MMethodDef = null
+			for md in m.mpropdefs do
+				if rta.live_methoddefs.has(md) then
+					if res != null then return null
+					res = md
+				end
+			end
+			return res
+		end
+	end
+
 	# Globaly compile the type structure of a live type
 	fun compile_type_to_c(mtype: MType)
 	do
-- 
1.7.9.5