Merge branch '3.1.x'

ICSharpCode.Decompiler.Tests/TestCases/Correctness/MemberLookup.cs

@@ -29,6 +29,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Correctness
 			Console.WriteLine((new Child1() as Base1).Field);
 			Child1.Test();
 			delegateConstruction();
+			new Child2b().CallTestMethod();
 			return 0;
 		}
 		
@@ -82,6 +83,8 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Correctness
 					child.TestMethod();
 				Console.WriteLine("Child1.TestMethod()");
 				Console.WriteLine("Property = " + Property + " " + base.Property);
+				Console.WriteLine("Field = " + Field);
+				Console.WriteLine("base.Field = " + base.Field);
 			}
 			
 			new public void TestAction()
@@ -97,5 +100,24 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Correctness
 				}
 			}
 		}
+
+		class Child2 : Base1
+		{
+			public void CallTestMethod()
+			{
+				Console.WriteLine("Child2 calling this.TestMethod():");
+				this.TestMethod();
+				Console.WriteLine("Child2 calling base.TestMethod():");
+				base.TestMethod();
+			}
+		}
+
+		class Child2b : Child2
+		{
+			protected override void TestMethod()
+			{
+				Console.WriteLine("Child2b.TestMethod");
+			}
+		}
 	}
 }

ICSharpCode.Decompiler.Tests/TestCases/Pretty/FixProxyCalls.cs

@@ -32,7 +32,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.ILPretty
 	{
 		protected internal IEnumerable<string> Test2(string test)
 		{
-			yield return Test(test);
+			yield return base.Test(test);
 		}
 	}
 

ICSharpCode.Decompiler/CSharp/CallBuilder.cs

@@ -208,8 +208,12 @@ namespace ICSharpCode.Decompiler.CSharp
 					} else {
 						if (method.IsStatic)
 							requireTarget = !expressionBuilder.IsCurrentOrContainingType(method.DeclaringTypeDefinition) || method.Name == ".cctor";
+						else if (method.Name == ".ctor")
+							requireTarget = true; // always use target for base/this-ctor-call, the constructor initializer pattern depends on this
+						else if (target.Expression is BaseReferenceExpression)
+							requireTarget = (callOpCode != OpCode.CallVirt && method.IsVirtual);
 						else
-							requireTarget = !(target.Expression is ThisReferenceExpression || target.Expression is BaseReferenceExpression) || method.Name == ".ctor";
+							requireTarget = !(target.Expression is ThisReferenceExpression);
 					}
 					bool targetCasted = false;
 					bool argumentsCasted = false;