From: Ludovic Henry <ludovic@xamarin.com>
Date: Thu, 12 Jan 2017 18:31:59 +0000 (-0200)
Subject: [hybrid] Enable gsharedvt trampoline on amd64
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=c5d43075c371c867f62e1df36a306ef69f398238

[hybrid] Enable gsharedvt trampoline on amd64
---

diff --git a/mono/mini/tramp-amd64-gsharedvt.c b/mono/mini/tramp-amd64-gsharedvt.c
index f5600adbde7..0c986f14e7b 100644
--- a/mono/mini/tramp-amd64-gsharedvt.c
+++ b/mono/mini/tramp-amd64-gsharedvt.c
@@ -142,7 +142,8 @@ mono_arch_get_gsharedvt_arg_trampoline (MonoDomain *domain, gpointer arg, gpoint
 	mono_arch_flush_icache (start, code - start);
 	mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL);
 
-	g_assert (0);
+	mono_tramp_info_register (mono_tramp_info_create (NULL, start, code - start, NULL, NULL), domain);
+
 	return start;
 }
 
@@ -281,7 +282,7 @@ mono_arch_get_gsharedvt_trampoline (MonoTrampInfo **info, gboolean aot)
 			amd64_call_reg (code, AMD64_R11);
 		#endif
 	} else {
-		g_error ("no aot");
+		amd64_call_code (code, mono_amd64_start_gsharedvt_call);
 	}
 
 	/* Method to call is now on RAX. Restore regs and jump */