Merge pull request #88 from JetBrains/evaluationFixes

Evaluation fixes

Author: David Karlaš

Mono.Debugger.Soft/Mono.Debugger.Soft/ThreadMirror.cs

@@ -13,6 +13,8 @@ public class ThreadMirror : ObjectMirror
 		ManualResetEvent fetchingEvent = new ManualResetEvent (false);
 		ThreadInfo info;
 		StackFrame[] frames;
+		bool threadStateInvalid = true;
+		ThreadState threadState;
 
 		internal ThreadMirror (VirtualMachine vm, long id) : base (vm, id) {
 		}
@@ -30,6 +32,7 @@ public StackFrame[] GetFrames () {
 
 		internal void InvalidateFrames () {
 			cacheInvalid = true;
+			threadStateInvalid = true;
 		}
 
 		internal void FetchFrames (bool mustFetch = false) {
@@ -91,7 +94,11 @@ public string Name {
 
 		public ThreadState ThreadState {
 			get {
-				return (ThreadState)vm.conn.Thread_GetState (id);
+				if (threadStateInvalid) {
+					threadState = (ThreadState) vm.conn.Thread_GetState (id);
+					threadStateInvalid = false;
+				}
+				return threadState;
 			}
 		}
 

Mono.Debugging.Soft/SoftDebuggerAdaptor.cs

@@ -35,6 +35,7 @@
 using System.Threading;
 
 using Mono.Debugger.Soft;
+using Mono.Debugging.Backend;
 using Mono.Debugging.Evaluation;
 using Mono.Debugging.Client;
 
@@ -1241,6 +1242,16 @@ public override void GetNamespaceContents (EvaluationContext ctx, string namspac
 			types.CopyTo (childTypes);
 		}
 
+		protected override ObjectValue CreateObjectValueImpl (EvaluationContext ctx, IObjectValueSource source, ObjectPath path, object obj, ObjectValueFlags flags)
+		{
+			try {
+				return base.CreateObjectValueImpl (ctx, source, path, obj, flags);
+			}
+			catch (NotSupportedException e) {
+				throw new EvaluatorException ("Evaluation failed: {0}", e.Message);
+			}
+		}
+
 		protected override IEnumerable<ValueReference> OnGetParameters (EvaluationContext ctx)
 		{
 			var soft = (SoftEvaluationContext) ctx;

Mono.Debugging.Soft/SoftEvaluationContext.cs

@@ -29,6 +29,7 @@
 using Mono.Debugger.Soft;
 using DC = Mono.Debugging.Client;
 using System.Runtime.CompilerServices;
+using System.Threading;
 
 namespace Mono.Debugging.Soft
 {
@@ -184,7 +185,11 @@ Value RuntimeInvoke (MethodMirror method, object target, Value[] values, bool en
 				return method.Evaluate (target is TypeMirror ? null : (Value) target, values);
 			} catch (NotSupportedException) {
 				AssertTargetInvokeAllowed ();
-
+				var threadState = Thread.ThreadState;
+				if ((threadState & ThreadState.WaitSleepJoin) == ThreadState.WaitSleepJoin) {
+					DC.DebuggerLoggingService.LogMessage ("Thread state before evaluation is {0}", threadState);
+					throw new EvaluatorException ("Evaluation is not allowed when the thread is in 'Wait' state");
+				}
 				var mc = new MethodCall (this, method, target, values, enableOutArgs);
 				//Since runtime is returning NOT_SUSPENDED error if two methods invokes are executed
 				//at same time we have to lock invoking to prevent this...