Imported Upstream version 3.12.0

Former-commit-id: cf92446697332992ec36726e78eb8703e1f259d7

mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs

@@ -22,6 +22,10 @@ public class TestsBase
 	static string base_static_s = "C";
 #pragma warning restore 0414
 #pragma warning restore 0169
+
+	public virtual string virtual_method () {
+		return "V1";
+	}
 }
 
 public enum AnEnum {
@@ -1365,6 +1369,10 @@ public class Tests : TestsBase, ITest2
 		j = 5;
 		set_ip_2 ();
 	}
+
+	public override string virtual_method () {
+		return "V2";
+	}
 }
 
 class TypeLoadClass {

mcs/class/Mono.Debugger.Soft/Test/dtest.cs

@@ -2137,6 +2137,11 @@ public class DebuggerTests
 		v = this_obj.InvokeMethod (e.Thread, m, null);
 		AssertValue (42, v);
 
+		// virtual call
+		m = t.BaseType.GetMethod ("virtual_method");
+		v = this_obj.InvokeMethod (e.Thread, m, null, InvokeOptions.Virtual);
+		AssertValue ("V2", v);
+
 #if NET_4_5
 		// instance
 		m = t.GetMethod ("invoke_pass_ref");
@@ -2864,8 +2869,10 @@ public class DebuggerTests
 
 		var frames = e.Thread.GetFrames ();
 		Assert.AreEqual ("invoke_in_domain", frames [0].Method.Name);
+		Assert.AreEqual (domain, frames [0].Domain);
 		Assert.AreEqual ("invoke", frames [1].Method.Name);
 		Assert.AreEqual ("domains", frames [2].Method.Name);
+		Assert.AreEqual (vm.RootDomain, frames [2].Domain);
 
 		// Test breakpoints on already JITted methods in other domains
 		m = entry_point.DeclaringType.GetMethod ("invoke_in_domain_2");