Merge pull request #2439 from stephentoub/unwrap_notcanceled

Fix small discrepancy in TaskExtensions.Unwrap

Author: stephentoub

src/System.Threading.Tasks/src/System/Threading/Tasks/TaskExtensions.CoreCLR.cs

@@ -215,14 +215,16 @@ private static CancellationToken ExtractCancellationToken(Task task)
             try
             {
                 task.GetAwaiter().GetResult();
+                Debug.Fail("Waiting on the canceled task should always result in an OCE, even if it's manufactured at the time of the wait.");
+                return new CancellationToken(true);
             }
             catch (OperationCanceledException oce)
             {
-                CancellationToken ct = oce.CancellationToken;
-                if (ct.IsCancellationRequested)
-                    return ct;
+                // This token may not have cancellation requested; that's ok.
+                // That can happen if, for example, the Task is canceled with
+                // TaskCompletionSource<T>.SetCanceled(), without a token.
+                return oce.CancellationToken;
             }
-            return new CancellationToken(true);
         }
 
         /// <summary>Dummy type to use as a void TResult.</summary>

src/System.Threading.Tasks/tests/UnwrapTests.cs

@@ -470,6 +470,10 @@ public static IEnumerable<object[]> CompletedNonGenericTasks
                 yield return new object[] { Task.CompletedTask };
                 yield return new object[] { Task.FromCanceled(CreateCanceledToken()) };
                 yield return new object[] { Task.FromException(new FormatException()) };
+
+                var tcs = new TaskCompletionSource<int>();
+                tcs.SetCanceled(); // cancel task without a token
+                yield return new object[] { tcs.Task };
             }
         }
 
@@ -481,6 +485,10 @@ public static IEnumerable<object[]> CompletedStringTasks
                 yield return new object[] { Task.FromResult("Tasks") };
                 yield return new object[] { Task.FromCanceled<string>(CreateCanceledToken()) };
                 yield return new object[] { Task.FromException<string>(new FormatException()) };
+
+                var tcs = new TaskCompletionSource<string>();
+                tcs.SetCanceled(); // cancel task without a token
+                yield return new object[] { tcs.Task };
             }
         }