Author: zoltan
Date: 2005-12-13 20:02:24 -0500 (Tue, 13 Dec 2005)
New Revision: 54334

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/reflection.c
Log:
2005-12-14  Zoltan Varga  <[EMAIL PROTECTED]>

        * reflection.c (ensure_runtime_vtable): Revert the last change as it
        is still broken.


Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2005-12-14 00:41:34 UTC (rev 54333)
+++ trunk/mono/mono/metadata/ChangeLog  2005-12-14 01:02:24 UTC (rev 54334)
@@ -1,7 +1,10 @@
 2005-12-14  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * reflection.c (ensure_runtime_vtable): Revert the last change as it
+       is still broken.
+       
        * reflection.c (ensure_runtime_vtable): Fix build.
-       
+
        * reflection.c (ensure_runtime_vtable): Disable an optimization which
        doesn't work in all cases.
 

Modified: trunk/mono/mono/metadata/reflection.c
===================================================================
--- trunk/mono/mono/metadata/reflection.c       2005-12-14 00:41:34 UTC (rev 
54333)
+++ trunk/mono/mono/metadata/reflection.c       2005-12-14 01:02:24 UTC (rev 
54334)
@@ -9094,11 +9094,9 @@
         * FIXME: This doesn't work, because some runtime code like 
         * ves_icall_Type_GetMethodsByName depends on method->slot being 
defined.
         */
-#if 0  
        if (!((MonoDynamicImage*)klass->image)->run)
                /* No need to create a generic vtable */
                return;
-#endif
 
        /* Overrides */
        onum = 0;
@@ -9125,10 +9123,6 @@
                                overrides [onum * 2 + 1] =
                                        mb->mhandle;
 
-                               if ((overrides [onum * 2] == 0) || (overrides 
[(onum * 2) + 1] == 0))
-                                       /* FIXME: This happens during corlib 
compilation */
-                                       return;
-
                                g_assert (mb->mhandle);
 
                                onum ++;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to