Author: martin
Date: 2005-04-19 15:12:06 -0400 (Tue, 19 Apr 2005)
New Revision: 43285
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/ecore.cs
Log:
**** Merged r42921 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-19 19:10:31 UTC (rev 43284)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-19 19:12:06 UTC (rev 43285)
@@ -1,3 +1,10 @@
+2005-04-13 Raja R Harinath <[EMAIL PROTECTED]>
+
+ Fix #74528.
+ * ecore.cs (PropertyExpr.InstanceResolve): Handle a case of
+ IdenticalNameAndTypeName here.
+ (EventExpr.InstanceResolve): Likewise.
+
2005-04-13 Marek Safar <[EMAIL PROTECTED]>
C# 2.0 DefaultCharSetAttribute implementation
Modified: trunk/mcs/gmcs/ecore.cs
===================================================================
--- trunk/mcs/gmcs/ecore.cs 2005-04-19 19:10:31 UTC (rev 43284)
+++ trunk/mcs/gmcs/ecore.cs 2005-04-19 19:12:06 UTC (rev 43285)
@@ -3525,6 +3525,9 @@
return false;
}
+ if (!IsInstance || InstanceExpression ==
EmptyExpression.Null)
+ InstanceExpression = null;
+
if (InstanceExpression != null) {
InstanceExpression =
InstanceExpression.DoResolve (ec);
if (InstanceExpression == null)
@@ -3858,6 +3861,9 @@
return false;
}
+ if (!IsInstance || InstanceExpression ==
EmptyExpression.Null)
+ InstanceExpression = null;
+
if (InstanceExpression != null) {
InstanceExpression =
InstanceExpression.DoResolve (ec);
if (InstanceExpression == null)
@@ -3888,6 +3894,9 @@
public override Expression DoResolve (EmitContext ec)
{
+ if (!IsInstance)
+ InstanceExpression = null;
+
if (InstanceExpression != null) {
InstanceExpression =
InstanceExpression.DoResolve (ec);
if (InstanceExpression == null)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
