Properly handle newslot in GetBaseMethod

2 files changed, 15 insertions, 0 deletions

diff --git a/rocks/Mono.Cecil.Rocks/MethodDefinitionRocks.cs b/rocks/Mono.Cecil.Rocks/MethodDefinitionRocks.cs
index c2f758d..39a2d90 100644
--- a/rocks/Mono.Cecil.Rocks/MethodDefinitionRocks.cs
+++ b/rocks/Mono.Cecil.Rocks/MethodDefinitionRocks.cs
@@ -41,6 +41,8 @@ namespace Mono.Cecil.Rocks {
 				throw new ArgumentNullException ("self");
 			if (!self.IsVirtual)
 				return self;
+			if (self.IsNewSlot)
+				return self;
 
 			var base_type = ResolveBaseType (self.DeclaringType);
 			while (base_type != null) {
diff --git a/rocks/Test/Mono.Cecil.Tests/MethodDefinitionRocksTests.cs b/rocks/Test/Mono.Cecil.Tests/MethodDefinitionRocksTests.cs
index 2cfe014..4c6e3fb 100644
--- a/rocks/Test/Mono.Cecil.Tests/MethodDefinitionRocksTests.cs
+++ b/rocks/Test/Mono.Cecil.Tests/MethodDefinitionRocksTests.cs
@@ -11,18 +11,27 @@ namespace Mono.Cecil.Tests {
 
 		abstract class Foo {
 			public abstract void DoFoo ();
+			public abstract void DoBar ();
 		}
 
 		class Bar : Foo {
 			public override void DoFoo ()
 			{
 			}
+
+			public override void DoBar ()
+			{
+			}
 		}
 
 		class Baz : Bar {
 			public override void DoFoo ()
 			{
 			}
+
+			public virtual new void DoBar ()
+			{
+			}
 		}
 
 		[Test]
@@ -38,6 +47,10 @@ namespace Mono.Cecil.Tests {
 			Assert.AreEqual ("Foo", @base.DeclaringType.Name);
 
 			Assert.AreEqual (@base, @base.GetBaseMethod ());
+
+			var new_dobar = baz.GetMethod ("DoBar");
+			@base = new_dobar.GetBaseMethod();
+			Assert.AreEqual("Baz", @base.DeclaringType.Name);
 		}
 
 		[Test]