projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'upstream/master'
[mono.git]
/
mono
/
metadata
/
object.c
diff --git
a/mono/metadata/object.c
b/mono/metadata/object.c
index f65b690c4e7608d66d5e370652ee1c991e5d8f68..565285f5b14be303b2c164f5abbcdf6e19de70c4 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);
}
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);
if (old_thunk != vtable_trampoline && old_thunk != imt_trampoline)
invalidate_generic_virtual_thunk (domain, old_thunk);
+#endif
}
mono_domain_unlock (domain);
}
mono_domain_unlock (domain);