X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Flambda.cs;h=7868c6a2c9d49b576a63cc69b088fd6e9c722a2d;hb=a4a84a1325565b912b1fe4d19d40cfd0affa1a3a;hp=2fba7ed4738c3129f1d2fac536922d66afc74c43;hpb=23410780cf35004c93f96261666798f895588f19;p=mono.git

diff --git a/mcs/mcs/lambda.cs b/mcs/mcs/lambda.cs
index 2fba7ed4738..7868c6a2c9d 100644
--- a/mcs/mcs/lambda.cs
+++ b/mcs/mcs/lambda.cs
@@ -65,7 +65,7 @@ namespace Mono.CSharp {
 			AParametersCollection d_params = Delegate.GetParameters (delegateType);
 
 			if (HasExplicitParameters) {
-				if (!VerifyExplicitParameters (ec, delegateType, d_params))
+				if (!VerifyExplicitParameters (ec, tic, delegateType, d_params))
 					return null;
 
 				return Parameters;
@@ -75,7 +75,7 @@ namespace Mono.CSharp {
 			// If L has an implicitly typed parameter list we make implicit parameters explicit
 			// Set each parameter of L is given the type of the corresponding parameter in D
 			//
-			if (!VerifyParameterCompatibility (ec, delegateType, d_params, ec.IsInProbingMode))
+			if (!VerifyParameterCompatibility (ec, tic, delegateType, d_params, ec.IsInProbingMode))
 				return null;
 
 			TypeSpec [] ptypes = new TypeSpec [Parameters.Count];
@@ -182,7 +182,7 @@ namespace Mono.CSharp {
 		ExpressionStatement statement;
 
 		public ContextualReturn (Expression expr)
-			: base (expr, expr.Location)
+			: base (expr, expr.StartLocation)
 		{
 		}
 
@@ -191,7 +191,7 @@ namespace Mono.CSharp {
 			return Expr.CreateExpressionTree (ec);
 		}
 
-		public override void Emit (EmitContext ec)
+		protected override void DoEmit (EmitContext ec)
 		{
 			if (statement != null) {
 				statement.EmitStatement (ec);
@@ -203,7 +203,7 @@ namespace Mono.CSharp {
 				return;
 			}
 
-			base.Emit (ec);
+			base.DoEmit (ec);
 		}
 
 		protected override bool DoResolve (BlockContext ec)