2009-08-13 Marek Safar <marek.safar@gmail.com>

[mono.git] / mcs / mcs / anonymous.cs

diff --git a/mcs/mcs/anonymous.cs b/mcs/mcs/anonymous.cs
index db407ac94a44e01e6a57feed8a09c6e564672e52..fed1f93bccd7a6b455189f083b9c4e8ae58c5a6b 100644 (file)
--- a/mcs/mcs/anonymous.cs
+++ b/mcs/mcs/anonymous.cs
@@ -1008,16 +1008,12 @@ namespace Mono.CSharp {
                {
                        AnonymousMethodBody am;
                        using (ec.Set (EmitContext.Flags.ProbingMode | EmitContext.Flags.InferReturnType)) {
-                               am = CompatibleMethod (ec, tic, TypeManager.null_type, delegate_type);
+                               am = CompatibleMethod (ec, tic, InternalType.Arglist, delegate_type);
                        }
                        
                        if (am == null)
                                return null;
 
-                       // Stop referencing gmcs NullLiteral type
-                       if (am.ReturnType == TypeManager.null_type)
-                               am.ReturnType = null;
-
                        return am.ReturnType;
                }
 
@@ -1311,8 +1307,10 @@ namespace Mono.CSharp {
 
                        IDisposable aec_dispose = null;
                        EmitContext.Flags flags = 0;
-                       if (ec.InferReturnType)
+                       if (ec.InferReturnType) {
                                flags |= EmitContext.Flags.InferReturnType;
+                               aec.ReturnTypeInference = new TypeInferenceContext ();
+                       }
 
                        if (ec.IsInProbingMode)
                                flags |= EmitContext.Flags.ProbingMode;
@@ -1330,8 +1328,10 @@ namespace Mono.CSharp {
                        bool unreachable;
                        bool res = aec.ResolveTopBlock (ec, Block, Block.Parameters, null, out unreachable);
 
-                       if (ec.InferReturnType)
-                               ReturnType = aec.ReturnType;
+                       if (ec.InferReturnType) {
+                               aec.ReturnTypeInference.FixAllTypes ();
+                               ReturnType = aec.ReturnTypeInference.InferredTypeArguments [0];
+                       }
 
                        if (aec_dispose != null) {
                                aec_dispose.Dispose ();