Author: raja
Date: 2006-06-21 08:48:37 -0400 (Wed, 21 Jun 2006)
New Revision: 61901

Modified:
   trunk/mcs/gmcs/ChangeLog
   trunk/mcs/gmcs/class.cs
   trunk/mcs/mcs/ChangeLog
   trunk/mcs/mcs/class.cs
Log:
Fix #78673
* mcs/class.cs (FieldBase.ResolveInitializer): Stop resolution if
FieldBuilder is null.
* gmcs/class.cs: Likewise.


Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog    2006-06-21 12:44:54 UTC (rev 61900)
+++ trunk/mcs/gmcs/ChangeLog    2006-06-21 12:48:37 UTC (rev 61901)
@@ -1,5 +1,9 @@
 2006-06-21  Raja R Harinath  <[EMAIL PROTECTED]>
 
+       Fix #78673
+       * class.cs (FieldBase.ResolveInitializer): Stop resolution if
+       FieldBuilder is null.
+
        Fix #78662
        * expression.cs (Binary.CheckShiftArguments): Don't overwrite original
        'left' and 'right' before error-checking.

Modified: trunk/mcs/gmcs/class.cs
===================================================================
--- trunk/mcs/gmcs/class.cs     2006-06-21 12:44:54 UTC (rev 61900)
+++ trunk/mcs/gmcs/class.cs     2006-06-21 12:48:37 UTC (rev 61901)
@@ -5441,6 +5441,8 @@
                        initializer = initializer.Resolve (ec);
                        if (initializer == null)
                                return null;
+                       if (FieldBuilder == null)
+                               return null;
 
                        FieldExpr fe = new FieldExpr (FieldBuilder, Location, 
true);
                        if ((ModFlags & Modifiers.STATIC) == 0) 

Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog     2006-06-21 12:44:54 UTC (rev 61900)
+++ trunk/mcs/mcs/ChangeLog     2006-06-21 12:48:37 UTC (rev 61901)
@@ -1,5 +1,9 @@
 2006-06-21  Raja R Harinath  <[EMAIL PROTECTED]>
 
+       Fix #78673
+       * class.cs (FieldBase.ResolveInitializer): Stop resolution if
+       FieldBuilder is null.
+
        Fix #78662
        * expression.cs (Binary.CheckShiftArguments): Don't overwrite original
        'left' and 'right' before error-checking.

Modified: trunk/mcs/mcs/class.cs
===================================================================
--- trunk/mcs/mcs/class.cs      2006-06-21 12:44:54 UTC (rev 61900)
+++ trunk/mcs/mcs/class.cs      2006-06-21 12:48:37 UTC (rev 61901)
@@ -5113,6 +5113,8 @@
                        initializer = initializer.Resolve (ec);
                        if (initializer == null)
                                return null;
+                       if (FieldBuilder == null)
+                               return null;
 
                        FieldExpr fe = new FieldExpr (FieldBuilder, Location, 
true);
                        if ((ModFlags & Modifiers.STATIC) == 0) 

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

Reply via email to