From e5abe31d73a25d131f4946d6a2fbbe2131547b3e Mon Sep 17 00:00:00 2001 From: zoltan Date: Fri, 26 Feb 2010 20:30:11 +0000 Subject: [PATCH] 2010-02-26 Zoltan Varga * class.c (get_implicit_generic_array_interfaces): Fix the last change so we don't call setup_interface_offsets () for unfinished types. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@152580 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/metadata/ChangeLog | 5 +++++ mono/metadata/class.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 792257cc2..6e832ec1a 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,5 +1,10 @@ 2010-02-26 Zoltan Varga + * class.c (get_implicit_generic_array_interfaces): Fix the last change so + we don't call setup_interface_offsets () for unfinished types. + +2010-02-26 Zoltan Varga + * class.c (mono_class_generic_sharing_enabled): Move this to generic-sharing.c. diff --git a/mono/metadata/class.c b/mono/metadata/class.c index a7d9a05bf..78bcf1bf1 100644 --- a/mono/metadata/class.c +++ b/mono/metadata/class.c @@ -2626,7 +2626,7 @@ get_implicit_generic_array_interfaces (MonoClass *class, int *num, int *is_enume idepth--; // FIXME: This doesn't seem to work/required for generic params - if (!(eclass->this_arg.type == MONO_TYPE_VAR || eclass->this_arg.type == MONO_TYPE_MVAR)) + if (!(eclass->this_arg.type == MONO_TYPE_VAR || eclass->this_arg.type == MONO_TYPE_MVAR || (eclass->image->dynamic && !eclass->wastypebuilder))) mono_class_setup_interface_offsets (eclass); interface_count = all_interfaces? eclass->interface_offsets_count: eclass->interface_count; -- 2.11.4.GIT