Author: zoltan
Date: 2005-03-09 05:50:37 -0500 (Wed, 09 Mar 2005)
New Revision: 41592
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/class.c
Log:
2005-03-09 Zoltan Varga <[EMAIL PROTECTED]>
* class.c (mono_class_is_assignable_from): Another try at fixing
#73469 without breaking anything.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2005-03-09 10:11:52 UTC (rev 41591)
+++ trunk/mono/mono/metadata/ChangeLog 2005-03-09 10:50:37 UTC (rev 41592)
@@ -1,3 +1,8 @@
+2005-03-09 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * class.c (mono_class_is_assignable_from): Another try at fixing
+ #73469 without breaking anything.
+
2005-03-08 Zoltan Varga <[EMAIL PROTECTED]>
* class.c: (mono_class_is_assignable_from): Revert the last changes
Modified: trunk/mono/mono/metadata/class.c
===================================================================
--- trunk/mono/mono/metadata/class.c 2005-03-09 10:11:52 UTC (rev 41591)
+++ trunk/mono/mono/metadata/class.c 2005-03-09 10:50:37 UTC (rev 41592)
@@ -3202,6 +3202,14 @@
oklass = oklass->generic_class->container_class;
if (MONO_CLASS_IS_INTERFACE (klass)) {
+ /* interface_offsets might not be set for dynamic classes */
+ if (oklass->reflection_info && !oklass->interface_offsets)
+ /*
+ * oklass might be a generic type parameter but they
have
+ * interface_offsets set.
+ */
+ return mono_reflection_call_is_assignable_from (klass,
oklass);
+
if ((klass->interface_id <= oklass->max_interface_id) &&
(oklass->interface_offsets [klass->interface_id] != -1))
return TRUE;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches