Merge branch 'BigIntegerParse'

[mono.git] / mcs / class / corlib / System.Runtime.CompilerServices / TaskAwaiter.cs

diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/TaskAwaiter.cs b/mcs/class/corlib/System.Runtime.CompilerServices/TaskAwaiter.cs
index 9bed9aaabc7190a1799eaa39d42bc20a203660b4..80b64cb56e841ac167288eb742725eca27a91d6b 100644 (file)
--- a/mcs/class/corlib/System.Runtime.CompilerServices/TaskAwaiter.cs
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/TaskAwaiter.cs
@@ -52,30 +52,59 @@ namespace System.Runtime.CompilerServices
 
                public void GetResult ()
                {
-                       if (task.Status != TaskStatus.RanToCompletion) {
+                       if (!task.IsCompleted)
+                               task.WaitCore (Timeout.Infinite, CancellationToken.None, true);
+
+                       if (task.Status != TaskStatus.RanToCompletion)
                                // Merge current and dispatched stack traces if there is any
                                ExceptionDispatchInfo.Capture (HandleUnexpectedTaskResult (task)).Throw ();
-                       }
                }
 
                internal static Exception HandleUnexpectedTaskResult (Task task)
                {
                        switch (task.Status) {
                        case TaskStatus.Canceled:
+                               // Use original exception when we have one
+                               if (task.ExceptionSlot.Exception != null)
+                                       goto case TaskStatus.Faulted;
+
                                return new TaskCanceledException (task);
                        case TaskStatus.Faulted:
-                               return task.Exception.InnerException;
+                               return task.ExceptionSlot.Exception.InnerException;
                        default:
-                               return new InvalidOperationException ("The task has not finished yet");
+                               throw new ArgumentException (string.Format ("Unexpected task `{0}' status `{1}'", task.Id, task.Status));
                        }
                }
 
                internal static void HandleOnCompleted (Task task, Action continuation, bool continueOnSourceContext, bool manageContext)
                {
-                       if (continueOnSourceContext && SynchronizationContext.Current != null) {
+                       if (continueOnSourceContext && SynchronizationContext.Current != null && SynchronizationContext.Current.GetType () != typeof (SynchronizationContext)) {
                                task.ContinueWith (new SynchronizationContextContinuation (continuation, SynchronizationContext.Current));
                        } else {
-                               task.ContinueWith (new ActionContinuation (continuation));
+                               IContinuation cont;
+                               Task cont_task;
+                               if (continueOnSourceContext && !TaskScheduler.IsDefault) {
+                                       cont_task = new Task (TaskActionInvoker.Create (continuation), null, CancellationToken.None, TaskCreationOptions.None, null);
+                                       cont_task.SetupScheduler (TaskScheduler.Current);
+                                       cont = new SchedulerAwaitContinuation (cont_task);
+                               } else {
+                                       cont_task = null;
+                                       cont = new AwaiterActionContinuation (continuation);
+                               }
+
+                               //
+                               // This is awaiter continuation. For finished tasks we get false result and need to
+                               // queue the continuation otherwise the task would block
+                               //
+                               if (task.ContinueWith (cont, false))
+                                       return;
+
+                               if (cont_task == null) {
+                                       cont_task = new Task (TaskActionInvoker.Create (continuation), null, CancellationToken.None, TaskCreationOptions.None, null);
+                                       cont_task.SetupScheduler (TaskScheduler.Current);
+                               }
+
+                               cont_task.Schedule (true);
                        }
                }