From b28e8eb77161f75a676f160365a860455db15476 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Thu, 15 Dec 2005 11:01:35 +0000 Subject: Merge from HEAD. svn path=/branches/mono-1-1-11/mono/; revision=54443 --- mono/metadata/ChangeLog | 4 ++++ mono/metadata/class.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index e434a23ab2f..a2e8a7c3c61 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,7 @@ +2005-12-15 Zoltan Varga + + * class.c (mono_class_setup_vtable): Call mono_reflection_get_dynamic_overrides () for dynamic classes. + 2005-12-14 Zoltan Varga * loader.c (mono_loader_set_error_type_load): Print the type load diff --git a/mono/metadata/class.c b/mono/metadata/class.c index 6ebab87f3cc..8d01a4f9b35 100644 --- a/mono/metadata/class.c +++ b/mono/metadata/class.c @@ -1553,7 +1553,10 @@ mono_class_setup_vtable (MonoClass *class) else context = (MonoGenericContext *) class->generic_container; - mono_class_get_overrides_full (class->image, class->type_token, &overrides, &onum, context); + if (class->image->dynamic) + mono_reflection_get_dynamic_overrides (class, &overrides, &onum); + else + mono_class_get_overrides_full (class->image, class->type_token, &overrides, &onum, context); mono_class_setup_vtable_general (class, overrides, onum); g_free (overrides); -- cgit v1.2.3