Imported Upstream version 5.10.0.116

Former-commit-id: 8f2f8afd053f1b5b4b35b0827e7a9424613038ae

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

@@ -322,6 +322,12 @@ public class Tests : TestsBase, ITest2
 			new Tests ().attach ();
 			return 0;
 		}
+		if (args.Length > 0 && args [0] == "step-out-void-async") {
+			var wait = new ManualResetEvent (false);
+			step_out_void_async (wait);
+			wait.WaitOne ();//Don't exist until step_out_void_async is executed...
+			return 0;
+		}
 		assembly_load ();
 		breakpoints ();
 		single_stepping ();
@@ -1726,6 +1732,19 @@ public class Tests : TestsBase, ITest2
 	{
 		UninitializedClass.Call();//Breakpoint here and step in
 	}
+
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	static async void step_out_void_async (ManualResetEvent wait)
+	{
+		await Task.Yield ();
+		step_out_void_async_2 ();
+		wait.Set ();
+	}
+
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	static void step_out_void_async_2 ()
+	{
+	}
 }
 
 public class SentinelClass : MarshalByRefObject {

mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id

@@ -1 +1 @@
-baa41091ff26fd05cb8ef05525565e96e4d31f82
+6e48d3edd50a7737adc6ec6d9325e46139ed8ffc