Author: martin
Date: 2005-04-13 07:41:06 -0400 (Wed, 13 Apr 2005)
New Revision: 42905
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/statement.cs
Log:
**** Merged r41187 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-13 11:40:12 UTC (rev 42904)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-13 11:41:06 UTC (rev 42905)
@@ -1,3 +1,9 @@
+2005-02-25 Raja R Harinath <[EMAIL PROTECTED]>
+
+ Fix #72924.
+ * statement.cs (ExpressionStatement.Resolve): Make robust to being
+ called twice in case of error.
+
2005-02-23 Chris Toshok <[EMAIL PROTECTED]>
Fix compiler portions of #72827.
Modified: trunk/mcs/gmcs/statement.cs
===================================================================
--- trunk/mcs/gmcs/statement.cs 2005-04-13 11:40:12 UTC (rev 42904)
+++ trunk/mcs/gmcs/statement.cs 2005-04-13 11:41:06 UTC (rev 42905)
@@ -530,7 +530,8 @@
public override bool Resolve (EmitContext ec)
{
- expr = expr.ResolveStatement (ec);
+ if (expr != null)
+ expr = expr.ResolveStatement (ec);
return expr != null;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches