Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d

mcs/class/Mono.Debugger.Soft/Makefile

@@ -9,7 +9,7 @@ LIB_MCS_FLAGS = /r:$(corlib) /unsafe -D:MONO_DATACONVERTER_STATIC_METHODS -keyfi
 
 TEST_MCS_FLAGS = /r:Mono.Cecil.dll /r:System.dll /r:System.Core.dll
 
-VALID_TEST_PROFILE := $(filter net_4_5, $(PROFILE))
+VALID_TEST_PROFILE := $(filter net_4_x, $(PROFILE))
 
 # The test exe is not profile specific, and compiling a 2.0 will make the 4.5 tests fail
 ifdef VALID_TEST_PROFILE

mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs

@@ -382,7 +382,8 @@ namespace Mono.Debugger.Soft
 		ERR_UNLOADED = 103,
 		ERR_NO_INVOCATION = 104,
 		ABSENT_INFORMATION = 105,
-		NO_SEQ_POINT_AT_IL_OFFSET = 106
+		NO_SEQ_POINT_AT_IL_OFFSET = 106,
+		INVOKE_ABORTED = 107
 	}
 
 	public class ErrorHandlerEventArgs : EventArgs {
@@ -417,7 +418,7 @@ namespace Mono.Debugger.Soft
 		 * with newer runtimes, and vice versa.
 		 */
 		internal const int MAJOR_VERSION = 2;
-		internal const int MINOR_VERSION = 41;
+		internal const int MINOR_VERSION = 42;
 
 		enum WPSuspendPolicy {
 			NONE = 0,

mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/ObjectMirror.cs

@@ -442,6 +442,9 @@ namespace Mono.Debugger.Soft
 
 			Interlocked.Decrement (ref r.NumPending);
 
+			if (error != 0)
+				r.ErrorCode = error;
+
 			if (r.NumPending == 0) {
 				r.IsCompleted = true;
 				((ManualResetEvent)r.AsyncWaitHandle).Set ();

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

@@ -342,6 +342,8 @@ public class Tests : TestsBase, ITest2
 			frames_in_native ();
 		if (args.Length > 0 && args [0] == "invoke-single-threaded")
 			new Tests ().invoke_single_threaded ();
+		if (args.Length > 0 && args [0] == "invoke-abort")
+			new Tests ().invoke_abort ();
 		new Tests ().evaluate_method ();
 		return 3;
 	}
@@ -944,6 +946,15 @@ public class Tests : TestsBase, ITest2
 	public void invoke_single_threaded_2 () {
 	}
 
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public void invoke_abort () {
+	}
+
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public void invoke_abort_2 () {
+		Thread.Sleep (1000000);
+	}
+
 	public void invoke_return_void () {
 	}
 

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

@@ -1 +1 @@
-0b47f1fbeb2c75de4f83067cd1412c5298cd8c63
+ff7b3616df855d53c0acc30c6f22b5e68b5e112c