From 92e72877bf971fef112165dcdfe9fb16eff8bc0e Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 4 Nov 2008 14:41:08 +0000 Subject: [PATCH] 2008-11-04 Zoltan Varga * aot-runtime.c (load_method): Run class initialization in the PLT case even if MONO_LOG_LEVEL is set. svn path=/trunk/mono/; revision=117882 --- mono/mini/ChangeLog | 3 +++ mono/mini/aot-runtime.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 1f18e2b0bbd..c03d73fd7d3 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,5 +1,8 @@ 2008-11-04 Zoltan Varga + * aot-runtime.c (load_method): Run class initialization in the PLT case even + if MONO_LOG_LEVEL is set. + * debug-mini.c (serialize_variable): Fix the encoding of dead variables. * aot-runtime.c (mono_aot_get_method): Skip out-of-date AOT modules. diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c index 3c13c773cf1..4a737c06990 100644 --- a/mono/mini/aot-runtime.c +++ b/mono/mini/aot-runtime.c @@ -1888,6 +1888,7 @@ load_method (MonoDomain *domain, MonoAotModule *aot_module, MonoImage *image, Mo { MonoClass *klass; MonoJumpInfo *patch_info = NULL; + gboolean from_plt = method == NULL; MonoMemPool *mp; int i, pindex, got_index = 0, n_patches, used_strings; gboolean non_got_patches, keep_patches = TRUE; @@ -2056,7 +2057,7 @@ load_method (MonoDomain *domain, MonoAotModule *aot_module, MonoImage *image, Mo mono_aot_unlock (); - if (!method && klass) + if (from_plt && klass) mono_runtime_class_init (mono_class_vtable (domain, klass)); return code; -- 2.11.4.GIT