Author: zoltan
Date: 2005-03-08 09:21:14 -0500 (Tue, 08 Mar 2005)
New Revision: 41569
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/class.c
trunk/mono/mono/metadata/object-internals.h
trunk/mono/mono/metadata/reflection.c
Log:
2005-03-08 Zoltan Varga <[EMAIL PROTECTED]>
* class.c (mono_class_is_assignable_from): If oklass is dynamic, call
the managed IsAssignableFrom method. Fixes #73469.
* reflection.c (mono_reflection_call_is_assignable_from): New helper
function.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2005-03-08 13:53:41 UTC (rev 41568)
+++ trunk/mono/mono/metadata/ChangeLog 2005-03-08 14:21:14 UTC (rev 41569)
@@ -1,3 +1,11 @@
+2005-03-08 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * class.c (mono_class_is_assignable_from): If oklass is dynamic, call
+ the managed IsAssignableFrom method. Fixes #73469.
+
+ * reflection.c (mono_reflection_call_is_assignable_from): New helper
+ function.
+
2005-03-04 Zoltan Varga <[EMAIL PROTECTED]>
* object.c (mono_load_remote_field_new): Fix returning uninitialized
Modified: trunk/mono/mono/metadata/class.c
===================================================================
--- trunk/mono/mono/metadata/class.c 2005-03-08 13:53:41 UTC (rev 41568)
+++ trunk/mono/mono/metadata/class.c 2005-03-08 14:21:14 UTC (rev 41569)
@@ -3202,6 +3202,10 @@
oklass = oklass->generic_class->container_class;
if (MONO_CLASS_IS_INTERFACE (klass)) {
+ if (oklass->image->dynamic)
+ /* interface_offsets might not be set for dynamic
classes */
+ 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;
Modified: trunk/mono/mono/metadata/object-internals.h
===================================================================
--- trunk/mono/mono/metadata/object-internals.h 2005-03-08 13:53:41 UTC (rev
41568)
+++ trunk/mono/mono/metadata/object-internals.h 2005-03-08 14:21:14 UTC (rev
41569)
@@ -1023,6 +1023,9 @@
gpointer
mono_reflection_lookup_dynamic_token (MonoImage *image, guint32 token);
+gboolean
+mono_reflection_call_is_assignable_from (MonoClass *klass, MonoClass *oklass);
+
void
mono_image_build_metadata (MonoReflectionModuleBuilder *module);
Modified: trunk/mono/mono/metadata/reflection.c
===================================================================
--- trunk/mono/mono/metadata/reflection.c 2005-03-08 13:53:41 UTC (rev
41568)
+++ trunk/mono/mono/metadata/reflection.c 2005-03-08 14:21:14 UTC (rev
41569)
@@ -9410,3 +9410,25 @@
return get_declsec_action (assembly->image, idx, action, entry);
}
+
+gboolean
+mono_reflection_call_is_assignable_from (MonoClass *klass, MonoClass *oklass)
+{
+ MonoObject *res, *exc;
+ void *params [1];
+ static MonoMethod *method = NULL;
+
+ if (method == NULL) {
+ method = mono_class_get_method_from_name
(mono_defaults.monotype_class->parent, "IsAssignableFrom", 1);
+ g_assert (method);
+ }
+
+ params [0] = mono_type_get_object (mono_domain_get (),
&oklass->byval_arg);
+
+ res = mono_runtime_invoke (method, mono_type_get_object
(mono_domain_get (), &klass->byval_arg), params, &exc);
+ if (exc)
+ return FALSE;
+ else
+ return *(MonoBoolean*)mono_object_unbox (res);
+}
+
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches