From: Jean Privat <jean@pryen.org>
Date: Sun, 29 Mar 2015 09:10:30 +0000 (+0700)
Subject: sepcomp: fixup trampoline with tagged primitive values
X-Git-Tag: v0.7.3~5^2
X-Git-Url: http://nitlanguage.org

sepcomp: fixup trampoline with tagged primitive values

Signed-off-by: Jean Privat <jean@pryen.org>
---

diff --git a/src/compiler/separate_compiler.nit b/src/compiler/separate_compiler.nit
index ecfcc8e..f590c1a 100644
--- a/src/compiler/separate_compiler.nit
+++ b/src/compiler/separate_compiler.nit
@@ -2266,7 +2266,7 @@ class SeparateRuntimeFunction
 			var v2 = compiler.new_visitor
 			v2.add "{c_ret} {n2}{c_sig} \{"
 			v2.require_declaration(m.const_color)
-			var call = "(({c_funptrtype})({selfvar}->class->vft[{m.const_color}]))({arguments.join(", ")});"
+			var call = "(({c_funptrtype})({v2.class_info(selfvar)}->vft[{m.const_color}]))({arguments.join(", ")});"
 			if ret != null then
 				v2.add "return {call}"
 			else
@@ -2283,7 +2283,7 @@ class SeparateRuntimeFunction
 			var v2 = compiler.new_visitor
 			v2.add "{c_ret} {n2}{c_sig} \{"
 			v2.require_declaration(m.const_color)
-			var call = "(({c_funptrtype})({selfvar}->class->vft[{m.const_color}]))({arguments.join(", ")});"
+			var call = "(({c_funptrtype})({v2.class_info(selfvar)}->vft[{m.const_color}]))({arguments.join(", ")});"
 			if ret != null then
 				v2.add "return {call}"
 			else