2010-01-29 Zoltan Varga <vargaz@gmail.com>

* class.c (make_generic_param_class): Initialize interface offsets since we set klass->inited. Fixes #574819. svn path=/branches/mono-2-6/mono/; revision=150559
mono · Jan 29, 2010 · 34fb8bd · 34fb8bd
1 parent eed0322
commit 34fb8bd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-29  Zoltan Varga  <vargaz@gmail.com>
+
+	* class.c (make_generic_param_class): Initialize interface offsets since we
+	set klass->inited. Fixes #574819.
+
 2010-01-28  Zoltan Varga  <vargaz@gmail.com>
 
 	* domain.c (mono_domain_free): Send the END_UNLOAD profiler event before

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
@@ -5123,6 +5123,7 @@ make_generic_param_class (MonoGenericParam *param, MonoImage *image, gboolean is
 	if (count - pos > 0) {
 		klass->interface_count = count - pos;
 		klass->interfaces = mono_image_alloc0 (image, sizeof (MonoClass *) * (count - pos));
+		klass->interfaces_inited = TRUE;
 		for (i = pos; i < count; i++)
 			klass->interfaces [i - pos] = pinfo->constraints [i];
 	}
@@ -5142,6 +5143,12 @@ make_generic_param_class (MonoGenericParam *param, MonoImage *image, gboolean is
 
 	mono_class_setup_supertypes (klass);
 
+	if (count - pos > 0) {
+		mono_class_setup_vtable (klass->parent);
+		g_assert (!klass->parent->exception_type);
+		setup_interface_offsets (klass, klass->parent->vtable_size);
+	}
+
 	return klass;
 }