* class.c (mono_class_create_generic): Don't use 'is_initialized' field.

svn path=/trunk/mono/; revision=70717

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 330856b7754bd4a443cbf1dd5176fd6206898d8e..af0aa6382e9d42098afcb2fa5dbd6134452ea8b8 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-09  Raja R Harinath  <rharinath@novell.com>
+
+       * class.c (mono_class_create_generic): Don't use 'is_initialized' field.
+
 2007-01-08  Raja R Harinath  <rharinath@novell.com>
 
        * marshal.c (mono_marshal_get_runtime_invoke): Avoid aliasing

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 8e739807e27b51993ea41bf0c9f49817103ddeee..f3df5161c54e043fd981197694f7a24f0e2997da 100644 (file)
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -3096,12 +3096,11 @@ mono_class_create_generic (MonoInflatedGenericClass *gclass)
        int i;
 
        mono_loader_lock ();
-       if (gclass->is_initialized) {
+       if (gclass->klass) {
                mono_loader_unlock ();
                return;
        }
 
-       g_assert (!gclass->klass);
        gclass->klass = g_malloc0 (sizeof (MonoClass));
        klass = gclass->klass;
 
@@ -3173,7 +3172,7 @@ mono_class_create_generic (MonoInflatedGenericClass *gclass)
 
        if (MONO_CLASS_IS_INTERFACE (klass))
                setup_interface_offsets (klass, 0);
-       gclass->is_initialized = TRUE;
+
        mono_loader_unlock ();
 }