2003-02-11 Zoltan Varga <vargaz@freemail.hu>

	* trampoline.c (arch_create_jit_trampoline): This function should
	allways return a trampoline for managed methods. Fixes bug #29859.

svn path=/trunk/mono/; revision=11480

diff --git a/mono/jit/ChangeLog b/mono/jit/ChangeLog
index 6212d49756bed3457e92b79c05997586479f37a6..4a965198b20bae5e1b9c46f56f9c019521a7d5fb 100644 (file)
--- a/mono/jit/ChangeLog
+++ b/mono/jit/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-11  Zoltan Varga  <vargaz@freemail.hu>
+
+       * trampoline.c (arch_create_jit_trampoline): This function should 
+       allways return a trampoline for managed methods. Fixes bug #29859.
+
 2003-02-11  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * debug.c: allocate debug->source_files. Fixes GLib-CRITICAL upon

diff --git a/mono/jit/trampoline.c b/mono/jit/trampoline.c
index 24dfe0c021c1de0014f401a8feba121fb13c4db5..6ca8d116bc8ad1741eaca340b03e83a2a4d75df0 100644 (file)
--- a/mono/jit/trampoline.c
+++ b/mono/jit/trampoline.c
@@ -210,9 +210,7 @@ x86_magic_trampoline (int eax, int ecx, int edx, int esi, int edi,
 gpointer
 arch_create_jit_trampoline (MonoMethod *method)
 {
-       MonoDomain *domain = mono_domain_get ();
        guint8 *code, *buf;
-       GHashTable *jit_code_hash;
 
        /* previously created trampoline code */
        if (method->info)
@@ -245,17 +243,6 @@ arch_create_jit_trampoline (MonoMethod *method)
                return method->info;
        }
 
-       /* check if we already have JITed code */
-       if (mono_jit_share_code)
-               jit_code_hash = mono_root_domain->jit_code_hash;
-       else
-               jit_code_hash = domain->jit_code_hash;
-
-       if ((code = g_hash_table_lookup (jit_code_hash, method))) {
-               mono_jit_stats.methods_lookups++;
-               return code;
-       }
-
        if (!mono_generic_trampoline_code) {
                mono_generic_trampoline_code = buf = g_malloc (256);
                /* save caller save regs because we need to do a call */