Avoid an assert which is hit when a 3.0 runtime loads a 2.10 corlib. Fixes #9137.
authorZoltan Varga <vargaz@gmail.com>
Wed, 2 Jan 2013 13:52:41 +0000 (14:52 +0100)
committerZoltan Varga <vargaz@gmail.com>
Wed, 2 Jan 2013 13:52:41 +0000 (14:52 +0100)
mono/metadata/threads.c

index 2e05a9357930978ab2af75e1f0eee831ae411f46..f65f890749eeb81b928f36e060ee002b0673536d 100644 (file)
@@ -764,7 +764,8 @@ MonoInternalThread* mono_thread_create_internal (MonoDomain *domain, gpointer fu
                ResumeThread (thread_handle);
 
        /* Check that the managed and unmanaged layout of MonoInternalThread matches */
-       g_assert (((char*)&internal->unused2 - (char*)internal) == mono_defaults.internal_thread_class->fields [mono_defaults.internal_thread_class->field.count - 1].offset);
+       if (mono_check_corlib_version () == NULL)
+               g_assert (((char*)&internal->unused2 - (char*)internal) == mono_defaults.internal_thread_class->fields [mono_defaults.internal_thread_class->field.count - 1].offset);
 
        return internal;
 }