From 660bcf17d0cbf23a196c5834cae30605654695b2 Mon Sep 17 00:00:00 2001
From: Ben Maurer <benm@mono-cvs.ximian.com>
Date: Tue, 31 Aug 2004 15:30:38 +0000
Subject: [PATCH] 2004-08-31 Ben Maurer  <bmaurer@users.sourceforge.net>

	* delegate.cs: Add seperate instance expr field for miguel.

svn path=/trunk/mcs/; revision=33103
---
 mcs/mcs/ChangeLog   |  4 ++++
 mcs/mcs/delegate.cs | 18 +++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 93ff5783d5c..d3f68fd52f0 100755
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-31 Ben Maurer  <bmaurer@users.sourceforge.net>
+
+	* delegate.cs: Add seperate instance expr field for miguel.
+
 2004-08-29 Ben Maurer  <bmaurer@users.sourceforge.net>
 
 	* PointerArithmetic (Resolve): make sure we are not doing
diff --git a/mcs/mcs/delegate.cs b/mcs/mcs/delegate.cs
index 6ea3bb3bd27..f2f7d1ce824 100644
--- a/mcs/mcs/delegate.cs
+++ b/mcs/mcs/delegate.cs
@@ -646,6 +646,7 @@ namespace Mono.CSharp {
 		protected MethodBase constructor_method;
 		protected MethodBase delegate_method;
 		protected MethodGroupExpr method_group;
+		public Expression DelegateInstanceExpression;
 
 		public DelegateCreation () {}
 
@@ -671,11 +672,10 @@ namespace Mono.CSharp {
 		
 		public override void Emit (EmitContext ec)
 		{
-			if (method_group.InstanceExpression == null ||
-			    delegate_method.IsStatic)
+			if (DelegateInstanceExpression == null || delegate_method.IsStatic)
 				ec.ig.Emit (OpCodes.Ldnull);
 			else
-				method_group.InstanceExpression.Emit (ec);
+				DelegateInstanceExpression.Emit (ec);
 			
 			if (delegate_method.IsVirtual && !method_group.IsBase) {
 				ec.ig.Emit (OpCodes.Dup);
@@ -741,7 +741,7 @@ namespace Mono.CSharp {
 			}
 			
 			if (mg.InstanceExpression != null)
-				mg.InstanceExpression = mg.InstanceExpression.Resolve (ec);
+				DelegateInstanceExpression = mg.InstanceExpression.Resolve (ec);
 			else if (ec.IsStatic) {
 				if (!delegate_method.IsStatic) {
 					Report.Error (120, loc,
@@ -749,12 +749,12 @@ namespace Mono.CSharp {
 						      delegate_method.Name);
 					return null;
 				}
-				mg.InstanceExpression = null;
+				DelegateInstanceExpression = null;
 			} else
-				mg.InstanceExpression = ec.GetThis (loc);
+				DelegateInstanceExpression = ec.GetThis (loc);
 			
-			if (mg.InstanceExpression != null && mg.InstanceExpression.Type.IsValueType)
-				mg.InstanceExpression = new BoxedCast (mg.InstanceExpression);
+			if (DelegateInstanceExpression != null && DelegateInstanceExpression.Type.IsValueType)
+				DelegateInstanceExpression = new BoxedCast (mg.InstanceExpression);
 			
 			method_group = mg;
 			eclass = ExprClass.Value;
@@ -850,7 +850,7 @@ namespace Mono.CSharp {
 				return null;
 			}
 				
-			method_group.InstanceExpression = e;
+			DelegateInstanceExpression = e;
 			delegate_method = method_group.Methods [0];
 			
 			eclass = ExprClass.Value;
-- 
2.11.4.GIT