Merge mono/io-layer, mono/metadata, mono/arch/x86 and configure.in for Native Client

[mono.git] / mono / metadata / object.c

diff --git a/mono/metadata/object.c b/mono/metadata/object.c
index 39534444502d623f7c2bb550854e30f2ec2b51fc..cc550bc6a87759a3ba9d00a222bb49a42e9db271 100644 (file)
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -1709,8 +1709,12 @@ mono_method_add_generic_virtual_invocation (MonoDomain *domain, MonoVTable *vtab
                        g_ptr_array_free (sorted, TRUE);
                }
 
+#ifndef __native_client__
+               /* We don't re-use any thunks as there is a lot of overhead */
+               /* to deleting and re-using code in Native Client.          */
                if (old_thunk != vtable_trampoline && old_thunk != imt_trampoline)
                        invalidate_generic_virtual_thunk (domain, old_thunk);
+#endif
        }
 
        mono_domain_unlock (domain);