Pass cancellation tokens and tasks to OperationCanceledException and TaskCanceledException #2770
Conversation
…anceledException and TaskCanceledException Fixes dotnet#2100
|
Wow. It's deep. |
|
@vasily-kirichenko the only ones that matter for #2100 are the TaskCanceledException. The OperationCanceledException changes are just for completeness ;) |
|
Wow, I never knew. Great fix! |
| @@ -1541,8 +1541,8 @@ namespace Microsoft.FSharp.Control | |||
| let continuation (completedTask : Task<_>) : unit = | |||
| args.aux.trampolineHolder.Protect((fun () -> | |||
| if completedTask.IsCanceled then | |||
| if useCcontForTaskCancellation then args.aux.ccont(new OperationCanceledException()) | |||
| else args.aux.econt (ExceptionDispatchInfo.Capture(new TaskCanceledException())) | |||
| if useCcontForTaskCancellation then args.aux.ccont(new OperationCanceledException(args.aux.token)) | |||
There was a problem hiding this comment.
@eiriktsarpalis @matthid What is this were if args.aux.token.IsCancellationRequested then new OperationCanceledException(args.aux.token) else new OperationCanceledException() ?
I suspect a lot of corresponding C# code would do the same thing: if a cancellation continuation needs to be converted into a OCE, then you would attach the current cancellation token in scope to the OCE, at least on the condition that that the current cancellation token in scope is in the cancelled state,
| @@ -1555,8 +1555,8 @@ namespace Microsoft.FSharp.Control | |||
| let continuation (completedTask : Task) : unit = | |||
| args.aux.trampolineHolder.Protect((fun () -> | |||
| if completedTask.IsCanceled then | |||
| if useCcontForTaskCancellation then args.aux.ccont (new OperationCanceledException()) | |||
| else args.aux.econt (ExceptionDispatchInfo.Capture(new TaskCanceledException())) | |||
| if useCcontForTaskCancellation then args.aux.ccont (new OperationCanceledException(args.aux.token)) | |||
|
@eiriktsarpalis if you have a fix please open a PR |
This is exhibiting itself in #2100. Roslyn has a try/catch in ComputeProjectDiagnosticAnalyzerDiagnosticsAsync to see whether the cancellation came from the same cancellation token as the one that was passed into the analyzer.
The problem is Async isn't passing in the Task or CancelationToken to the exceptions, which C# does.
Fixes #2100