2010-05-28 Marek Safar <marek.safar@gmail.com>

A fix for bug #609049 * ecore.cs: Don't ignore override methods when looking for base member. svn path=/trunk/mcs/; revision=158087
mono · May 28, 2010 · d61eb6d · d61eb6d
1 parent 87eb8ff
commit d61eb6d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-28  Marek Safar  <marek.safar@gmail.com>
+
+	A fix for bug #609049
+	* ecore.cs: Don't ignore override methods when looking for base
+	member.
+
 2010-05-27  Marek Safar  <marek.safar@gmail.com>
 
 	A fix for bugs #608007, #572540, #566130, #476358

diff --git a/mcs/mcs/ecore.cs b/mcs/mcs/ecore.cs
@@ -3376,8 +3376,12 @@ protected virtual int GetApplicableParametersCount (MethodSpec method, AParamete
 		protected virtual IList<MemberSpec> GetBaseTypeMethods (ResolveContext rc, TypeSpec type)
 		{
 			var arity = type_arguments == null ? -1 : type_arguments.Count;
+			BindingRestriction restrictions = BindingRestriction.AccessibleOnly;
+			if (!is_base)
+				restrictions |= BindingRestriction.NoOverrides;
+
 			return TypeManager.MemberLookup (rc.CurrentType, null, type,
-				MemberKind.Method, BindingRestriction.AccessibleOnly | BindingRestriction.NoOverrides,
+				MemberKind.Method, restrictions,
 				Name, arity, null);
 		}