Fixes cloning of a variable declarator.

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

diff --git a/mcs/mcs/pending.cs b/mcs/mcs/pending.cs
index c82b60ccc3e4f79a1d6859a07e4d948b469d064f..23d80dfcc479c2ba3c39a1b70d1678394e18e22e 100644 (file)
--- a/mcs/mcs/pending.cs
+++ b/mcs/mcs/pending.cs
@@ -360,7 +360,14 @@ namespace Mono.CSharp {
                bool BaseImplements (TypeSpec iface_type, MethodSpec mi, out MethodSpec base_method)
                {
                        var base_type = container.BaseType;
-                       base_method = (MethodSpec) MemberCache.FindMember (base_type, new MemberFilter (mi), BindingRestriction.None);
+
+                       //
+                       // Setup filter with no return type to give better error message
+                       // about mismatch at return type when the check bellow rejects them
+                       //
+                       var filter = new MemberFilter (mi.Name, mi.Arity, MemberKind.Method, mi.Parameters, null);
+
+                       base_method = (MethodSpec) MemberCache.FindMember (base_type, filter, BindingRestriction.None);
 
                        if (base_method == null || (base_method.Modifiers & Modifiers.PUBLIC) == 0)
                                return false;
@@ -368,10 +375,8 @@ namespace Mono.CSharp {
                        if (base_method.DeclaringType.IsInterface)
                                return false;
 
-                       // Why was it here ????
-                       //if (TypeManager.ImplementsInterface (base_type, iface_type)) {
-                       //      return true;
-                       //}
+                       if (!TypeSpecComparer.Override.IsEqual (mi.ReturnType, base_method.ReturnType))
+                               return false;
 
                        if (!base_method.IsAbstract && !base_method.IsVirtual)
                                // FIXME: We can avoid creating a proxy if base_method can be marked 'final virtual' instead.
@@ -396,7 +401,7 @@ namespace Mono.CSharp {
 
                                bool base_implements_type = type.IsInterface &&
                                        container.BaseType != null &&
-                                       container.BaseType.ImplementsInterface (type);
+                                       container.BaseType.ImplementsInterface (type, false);
 
                                for (int j = 0; j < pending_implementations [i].methods.Count; ++j) {
                                        var mi = pending_implementations[i].methods[j];