Merge pull request #1174 from rhapsodyn/patch-1

[mono.git] / mono / metadata / marshal.c

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 0d40f550a264bf996422f3cc846bb22e2ab15047..4555510e80131af50660e4c699dd6102d9d9514c 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -2734,7 +2734,7 @@ get_wrapper_target_class (MonoImage *image)
         * To avoid these problems, we put the wrappers into the <Module> class of 
         * the image.
         */
-       if (image->dynamic)
+       if (image_is_dynamic (image))
                klass = ((MonoDynamicImage*)image)->wrappers_type;
        else
                klass = mono_class_get (image, mono_metadata_make_token (MONO_TABLE_TYPEDEF, 1));
@@ -5026,7 +5026,7 @@ mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual)
                /* Can't share this as we push a string as this */
                need_direct_wrapper = TRUE;
        } else {
-               if (method->dynamic)
+               if (method_is_dynamic (method))
                        callsig = signature_dup (method->klass->image, mono_method_signature (method));
                else
                        callsig = mono_method_signature (method);
@@ -12990,7 +12990,7 @@ mono_marshal_free_dynamic_wrappers (MonoMethod *method)
 {
        MonoImage *image = method->klass->image;
 
-       g_assert (method->dynamic);
+       g_assert (method_is_dynamic (method));
 
        /* This could be called during shutdown */
        if (marshal_mutex_initialized)