Author: zoltan
Date: 2005-12-13 19:41:34 -0500 (Tue, 13 Dec 2005)
New Revision: 54333

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): Fix build.


Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2005-12-14 00:10:54 UTC (rev 54332)
+++ trunk/mono/mono/metadata/ChangeLog  2005-12-14 00:41:34 UTC (rev 54333)
@@ -1,5 +1,7 @@
 2005-12-14  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * 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:10:54 UTC (rev 
54332)
+++ trunk/mono/mono/metadata/reflection.c       2005-12-14 00:41:34 UTC (rev 
54333)
@@ -9125,6 +9125,10 @@
                                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